ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved default config file into code where it belongs, fixed 32 bit setter

This commit is contained in:
Allen Webster 2017-06-22 20:01:43 -04:00
parent 70b585d69a
commit 8ad58cebed
3 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/setup_cl_generic.bat
View File

@ -1,5 +1,7 @@
@echo off
SET "LIB="
SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0
IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" %1))

43
meta/build.cpp
View File

@ -160,9 +160,6 @@ build_cl(u32 flags, char *code_path, char *code_file, char *out_path, char *out_
if (flags & X86){
build_ap(line_prefix, "%s\\build_scripts\\setup_cl_x86.bat & ", code_path);
}
else{
build_ap(line_prefix, "%s\\build_scripts\\setup_cl_x64.bat & ", code_path);
}
if (flags & OPTS){
build_ap(line, CL_OPTS);
@ -602,14 +599,11 @@ package(char *cdir){
#define SITE_DIR "../site"
#define PACK_DATA_DIR "../data/dist_files"
#define PACK_FONTS_DIR PACK_DATA_DIR"/fonts"
#define DATA_DIR "../data/test"
DECL_STR(build_dir, BUILD_DIR);
DECL_STR(site_dir, SITE_DIR);
DECL_STR(pack_dir, PACK_DIR);
DECL_STR(pack_data_dir, PACK_DATA_DIR);
DECL_STR(pack_fonts_dir, PACK_FONTS_DIR);
DECL_STR(data_dir, DATA_DIR);
#define PACK_ALPHA_PAR_DIR "../current_dist"
#define PACK_ALPHA_DIR PACK_ALPHA_PAR_DIR"/4coder"
@ -679,7 +673,7 @@ package(char *cdir){
copy_file(build_dir, "4ed" EXE, dir, 0, 0);
copy_file(build_dir, "4ed_app" DLL, dir, 0, 0);
copy_all(pack_fonts_dir, "*", fonts_dir);
copy_file(data_dir, "release-config.4coder", dir, 0, "config.4coder");
copy_file(cdir, "release-config.4coder", dir, 0, "config.4coder");
copy_folder(dir, "themes");
@ -759,7 +753,7 @@ package(char *cdir){
copy_file(build_dir, "4ed_app" DLL, dir, 0, 0);
copy_file(build_dir, "custom_4coder" DLL, dir, 0, 0);
copy_all(pack_fonts_dir, "*", fonts_dir);
copy_file(data_dir, "release-config.4coder", dir, 0, "config.4coder");
copy_file(cdir, "release-config.4coder", dir, 0, "config.4coder");
copy_all(0, "4coder_*", dir);
@ -772,39 +766,6 @@ package(char *cdir){
copy_folder(dir, "languages");
copy_folder(dir, "themes");
#if 0
DECL_STR(custom_dir, "4coder_API");
DECL_STR(custom_helper_dir, "4coder_helper");
DECL_STR(custom_lib_dir, "4coder_lib");
DECL_STR(fcpp_dir, "4cpp");
DECL_STR(languages, "languages");
DECL_STR(themes, "themes");
char *dir_array[] = {
custom_dir,
custom_helper_dir,
custom_lib_dir,
fcpp_dir,
languages,
themes,
};
i32 dir_count = ArrayCount(dir_array);
for (i32 j = 0; j < dir_count; ++j){
char *d = dir_array[j];
make_folder_if_missing(dir, d);
char space[256];
String copy_name = make_fixed_width_string(space);
append_sc(&copy_name, dir);
append_s_char(&copy_name, platform_correct_slash);
append_sc(&copy_name, d);
terminate_with_null(&copy_name);
copy_all(d, "*", copy_name.str);
}
#endif
get_4coder_dist_name(&str, true, zip_dir, tier, arch, "zip");
zip(par_dir, "4coder", str.str);
}

28
release-config.4coder Normal file
View File

@ -0,0 +1,28 @@
// Code Wrapping
enable_code_wrapping = true;
automatically_adjust_wrapping = true;
default_wrap_width = 672;
default_min_base_width = 550;
// This only applies to code files in code-wrapping mode.
// Plain text and code files without virtual-whitespace will not be effected.
automatically_indent_text_on_save = true;
// When set to true, all unsaved changes will be saved on a build.
automatically_save_changes_on_build = true;
// Theme
default_theme_name = "4coder";
default_font_name = "Liberation Mono";
// User
user_name = "NAME";
// Extensions
treat_as_code = ".cpp.c.hpp.h.cc.cs.java.rs";
// Load project on startup
automatically_load_project = false;
// Keyboard AltGr setting
lalt_lctrl_is_altgr = false;