mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

lots more cleanup on the file moving api

master
Allen Webster 2017-07-08 01:40:27 -04:00
parent 0a7b7d0d60
commit 0f307c67ac
4 changed files with 231 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildsuper_x86.bat
View File

@ -9,7 +9,7 @@ SET CODE_HOME=%~dp0
IF NOT "%Platform%" == "X86" IF NOT "%Platform%" == "x86" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x86.bat") IF NOT "%Platform%" == "X86" IF NOT "%Platform%" == "x86" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x86.bat")
SET SRC=%1 SET SRC=%1
if "%SRC%" == "" (SET SRC=4coder_default_bindings.cpp) if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp
SET OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX SET OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
SET OPTS=%OPTS% /GR- /nologo /FC SET OPTS=%OPTS% /GR- /nologo /FC
@ -17,7 +17,7 @@ SET DEBUG=/Zi
SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF
SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version
cl /I%CODE_HOME% %OPTS% %DEBUG% %SRC% /Fecustom_4coder %BUILD_DLL% %EXPORTS% cl %OPTS% /I"%CODE_HOME% " %DEBUG% "%SRC%" /Fecustom_4coder %BUILD_DLL% %EXPORTS%
REM file spammation preventation REM file spammation preventation
del *.exp del *.exp

157
meta/4ed_file_moving.h
View File

@ -52,10 +52,10 @@ internal u64 fm_get_time();
#define END_TIME_SECTION(n) uint64_t total = fm_get_time() - start; printf("%-20s: %.2llu.%.6llu\n", (n), LLU_CAST(total/1000000), LLU_CAST(total%1000000)); #define END_TIME_SECTION(n) uint64_t total = fm_get_time() - start; printf("%-20s: %.2llu.%.6llu\n", (n), LLU_CAST(total/1000000), LLU_CAST(total%1000000));
// Files and Folders Manipulation // Files and Folders Manipulation
internal void fm_make_folder_if_missing(char *dir, char *folder); internal void fm_make_folder_if_missing(char *dir);
internal void fm_clear_folder(char *folder); internal void fm_clear_folder(char *folder);
internal void fm_delete_file(char *file); internal void fm_delete_file(char *file);
internal void fm_copy_file(char *path, char *file, char *folder1, char *folder2, char *newname); internal void fm_copy_file(char *file, char *newname);
internal void fm_copy_all(char *source, char *tag, char *folder); internal void fm_copy_all(char *source, char *tag, char *folder);
internal void fm_copy_folder(char *dst_dir, char *src_folder); internal void fm_copy_folder(char *dst_dir, char *src_folder);
@ -66,7 +66,7 @@ internal void fm_zip(char *parent, char *folder, char *dest);
internal void fm_slash_fix(char *path); internal void fm_slash_fix(char *path);
internal char *fm_prepare_string_internal(char *s1, ...); internal char *fm_prepare_string_internal(char *s1, ...);
#define fm_prepare_string(...) fm_prepare_string_internal(__VA_ARGS__, 0) #define fm_str(...) fm_prepare_string_internal(__VA_ARGS__, 0)
typedef umem Temp_Memory; typedef umem Temp_Memory;
internal Temp_Memory fm_begin_temp(); internal Temp_Memory fm_begin_temp();
@ -82,6 +82,41 @@ typedef struct Temp_Dir{
internal Temp_Dir fm_pushdir(char *dir); internal Temp_Dir fm_pushdir(char *dir);
internal void fm_popdir(Temp_Dir temp); internal void fm_popdir(Temp_Dir temp);
// Build Line
#define BUILD_LINE_MAX 4096
typedef struct Build_Line{
char build_optionsA[BUILD_LINE_MAX];
char build_optionsB[BUILD_LINE_MAX];
char *build_options;
char *build_options_prev;
i32 build_max;
} Build_Line;
internal void fm_init_build_line(Build_Line *line);
internal void fm_finish_build_line(Build_Line *line);
internal void fm__swap_ptr(char **A, char **B);
#if defined(IS_CL)
#define fm_add_to_line(line, str, ...) do{ \
snprintf(line.build_options, \
line.build_max, "%s "str, \
line.build_options_prev, __VA_ARGS__); \
fm__swap_ptr(&line.build_options, &line.build_options_prev); \
}while(0)
#elif defined(IS_GCC)
#define fm_add_to_line(line, str, ...) do{ \
snprintf(line.build_options, line.build_max, "%s "str, \
line.build_options_prev, ##__VA_ARGS__); \
fm__swap_ptr(&line.build_options, &line.build_options_prev); \
}while(0)
#endif
// Slashes // Slashes
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
#define SLASH "\\" #define SLASH "\\"
@ -95,35 +130,35 @@ static char platform_correct_slash = '/';
// File Extensions // File Extensions
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
#define EXE ".exe" # define EXE ".exe"
#elif defined(IS_LINUX) || defined(IS_MAC) #elif defined(IS_LINUX) || defined(IS_MAC)
#define EXE "" # define EXE ""
#else #else
#error No EXE format specified for this OS # error No EXE format specified for this OS
#endif #endif
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
#define PDB ".pdb" # define PDB ".pdb"
#elif defined(IS_LINUX) || defined(IS_MAC) #elif defined(IS_LINUX) || defined(IS_MAC)
#define PDB "" # define PDB ""
#else #else
#error No PDB format specified for this OS # error No PDB format specified for this OS
#endif #endif
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
#define DLL ".dll" # define DLL ".dll"
#elif defined(IS_LINUX) || defined(IS_MAC) #elif defined(IS_LINUX) || defined(IS_MAC)
#define DLL ".so" # define DLL ".so"
#else #else
#error No DLL format specified for this OS # error No DLL format specified for this OS
#endif #endif
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
#define BAT ".bat" # define BAT ".bat"
#elif defined(IS_LINUX) || defined(IS_MAC) #elif defined(IS_LINUX) || defined(IS_MAC)
#define BAT ".sh" # define BAT ".sh"
#else #else
#error No BAT format specified for this OS # error No BAT format specified for this OS
#endif #endif
#endif #endif
@ -276,14 +311,10 @@ fm_slash_fix(char *path){
} }
static void static void
fm_make_folder_if_missing(char *dir, char *folder){ fm_make_folder_if_missing(char *dir){
char space[1024]; char space[1024];
String path = make_fixed_width_string(space); String path = make_fixed_width_string(space);
append_sc(&path, dir); append_sc(&path, dir);
if (folder){
append_sc(&path, "\\");
append_sc(&path, folder);
}
terminate_with_null(&path); terminate_with_null(&path);
char *p = path.str; char *p = path.str;
@ -308,32 +339,8 @@ fm_delete_file(char *file){
} }
static void static void
fm_copy_file(char *path, char *file, char *folder1, char *folder2, char *newname){ fm_copy_file(char *file, char *newname){
char src[256], dst[256]; CopyFileA(file, newname, 0);
String b = make_fixed_width_string(src);
if (path){
append_sc(&b, path);
append_sc(&b, "\\");
}
append_sc(&b, file);
terminate_with_null(&b);
b = make_fixed_width_string(dst);
append_sc(&b, folder1);
append_sc(&b, "\\");
if (folder2){
append_sc(&b, folder2);
append_sc(&b, "\\");
}
if (newname){
append_sc(&b, newname);
}
else{
append_sc(&b, file);
}
terminate_with_null(&b);
CopyFileA(src, dst, 0);
} }
static void static void
@ -383,7 +390,7 @@ fm_popdir(Temp_Dir temp){
static void static void
fm_init_system(){ fm_init_system(){
// NOTE(allen): do nothing fm__init_memory();
} }
static uint64_t static uint64_t
@ -433,13 +440,8 @@ static void
fm_slash_fix(char *path){} fm_slash_fix(char *path){}
static void static void
fm_make_folder_if_missing(char *dir, char *folder){ fm_make_folder_if_missing(char *dir){
if (folder){ systemf("mkdir -p %s", dir);
systemf("mkdir -p %s/%s", dir, folder);
}
else{
systemf("mkdir -p %s", dir);
}
} }
static void static void
@ -453,27 +455,8 @@ fm_delete_file(char *file){
} }
static void static void
fm_copy_file(char *path, char *file, char *folder1, char *folder2, char *newname){ fm_copy_file(char *file, char *newname){
if (!newname){ systemf("cp %s %s", file, newname);
newname = file;
}
if (path){
if (folder2){
systemf("cp %s/%s %s/%s/%s", path, file, folder1, folder2, newname);
}
else{
systemf("cp %s/%s %s/%s", path, file, folder1, newname);
}
}
else{
if (folder2){
systemf("cp %s %s/%s/%s", file, folder1, folder2, newname);
}
else{
systemf("cp %s %s/%s", file, folder1, newname);
}
}
} }
static void static void
@ -500,7 +483,7 @@ fm_zip(char *parent, char *folder, char *file){
internal void internal void
fm_copy_folder(char *dst_dir, char *src_folder){ fm_copy_folder(char *dst_dir, char *src_folder){
fm_make_folder_if_missing(dst_dir, src_folder); fm_make_folder_if_missing(fm_str(dst_dir, "/", src_folder));
char space[256]; char space[256];
String copy_name = make_fixed_width_string(space); String copy_name = make_fixed_width_string(space);
@ -540,6 +523,28 @@ fm_prepare_string_internal(char *s1, ...){
return(result); return(result);
} }
internal void
fm_init_build_line(Build_Line *line){
line->build_options = line->build_optionsA;
line->build_options_prev = line->build_optionsB;
line->build_optionsA[0] = 0;
line->build_optionsB[0] = 0;
line->build_max = BUILD_LINE_MAX;
}
internal void
fm_finish_build_line(Build_Line *line){
fm__swap_ptr(&line->build_options, &line->build_options_prev);
}
internal void
fm__swap_ptr(char **A, char **B){
char *a = *A;
char *b = *B;
*A = b;
*B = a;
}
#endif #endif
// BOTTOM // BOTTOM

355
meta/build.cpp
View File

@ -21,51 +21,6 @@
// reusable // reusable
// //
static void
swap_ptr(char **A, char **B){
char *a = *A;
char *b = *B;
*A = b;
*B = a;
}
#define BUILD_LINE_MAX 4096
typedef struct Build_Line{
char build_optionsA[BUILD_LINE_MAX];
char build_optionsB[BUILD_LINE_MAX];
char *build_options;
char *build_options_prev;
i32 build_max;
} Build_Line;
static void
init_build_line(Build_Line *line){
line->build_options = line->build_optionsA;
line->build_options_prev = line->build_optionsB;
line->build_optionsA[0] = 0;
line->build_optionsB[0] = 0;
line->build_max = BUILD_LINE_MAX;
}
#if defined(IS_CL)
#define build_ap(line, str, ...) do{ \
snprintf(line.build_options, \
line.build_max, "%s "str, \
line.build_options_prev, __VA_ARGS__); \
swap_ptr(&line.build_options, &line.build_options_prev); \
}while(0)
#elif defined(IS_GCC)
#define build_ap(line, str, ...) do{ \
snprintf(line.build_options, line.build_max, "%s "str, \
line.build_options_prev, ##__VA_ARGS__); \
swap_ptr(&line.build_options, &line.build_options_prev); \
}while(0)
#endif
// //
// 4coder specific // 4coder specific
// //
@ -171,87 +126,86 @@ enum{
static void static void
build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_file, char *exports, char **inc_folders){ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_file, char *exports, char **inc_folders){
Build_Line line; Build_Line line;
init_build_line(&line);
Build_Line link_line; Build_Line link_line;
init_build_line(&link_line);
Build_Line line_prefix; Build_Line line_prefix;
init_build_line(&line_prefix);
fm_init_build_line(&line);
fm_init_build_line(&link_line);
fm_init_build_line(&line_prefix);
if (flags & X86){ if (flags & X86){
build_ap(line_prefix, "%s\\windows_scripts\\setup_cl_x86.bat & ", code_path); fm_add_to_line(line_prefix, "%s\\windows_scripts\\setup_cl_x86.bat & ", code_path);
} }
if (flags & OPTS){ if (flags & OPTS){
build_ap(line, CL_OPTS); fm_add_to_line(line, CL_OPTS);
} }
if (flags & X86){ if (flags & X86){
build_ap(line, "/DFTECH_32_BIT"); fm_add_to_line(line, "/DFTECH_32_BIT");
} }
if (flags & LOG){ if (flags & LOG){
build_ap(line, "/DUSE_LOG /DUSE_LOGF"); fm_add_to_line(line, "/DUSE_LOG /DUSE_LOGF");
} }
if (flags & INCLUDES){ if (flags & INCLUDES){
build_ap(line, CL_INCLUDES); fm_add_to_line(line, CL_INCLUDES);
} }
if (flags & SITE_INCLUDES){ if (flags & SITE_INCLUDES){
build_ap(line, CL_SITE_INCLUDES); fm_add_to_line(line, CL_SITE_INCLUDES);
} }
if (inc_folders != 0){ if (inc_folders != 0){
for (u32 i = 0; inc_folders[i] != 0; ++i){ for (u32 i = 0; inc_folders[i] != 0; ++i){
build_ap(line, "/I%s\\%s", code_path, inc_folders[i]); fm_add_to_line(line, "/I%s\\%s", code_path, inc_folders[i]);
} }
} }
if (flags & LIBS){ if (flags & LIBS){
if (flags & X86){ if (flags & X86){
build_ap(line, CL_LIBS_X86); fm_add_to_line(line, CL_LIBS_X86);
} }
else{ else{
build_ap(line, CL_LIBS_X64); fm_add_to_line(line, CL_LIBS_X64);
} }
} }
if (flags & ICON){ if (flags & ICON){
build_ap(line, CL_ICON); fm_add_to_line(line, CL_ICON);
} }
if (flags & DEBUG_INFO){ if (flags & DEBUG_INFO){
build_ap(line, "/Zi"); fm_add_to_line(line, "/Zi");
} }
if (flags & OPTIMIZATION){ if (flags & OPTIMIZATION){
build_ap(line, "/O2"); fm_add_to_line(line, "/O2");
} }
if (flags & SHARED_CODE){ if (flags & SHARED_CODE){
build_ap(line, "/LD"); fm_add_to_line(line, "/LD");
} }
if (flags & SUPER){ if (flags & SUPER){
build_ap(line, "/DFRED_SUPER"); fm_add_to_line(line, "/DFRED_SUPER");
} }
if (flags & INTERNAL){ if (flags & INTERNAL){
build_ap(line, "/DFRED_INTERNAL"); fm_add_to_line(line, "/DFRED_INTERNAL");
} }
if (flags & KEEP_ASSERT){ if (flags & KEEP_ASSERT){
build_ap(line, "/DFRED_KEEP_ASSERT"); fm_add_to_line(line, "/DFRED_KEEP_ASSERT");
} }
if (flags & X86){ if (flags & X86){
build_ap(link_line, CL_X86); fm_add_to_line(link_line, CL_X86);
} }
if (flags & DEBUG_INFO){ if (flags & DEBUG_INFO){
build_ap(link_line, "/DEBUG"); fm_add_to_line(link_line, "/DEBUG");
} }
char link_type_string[1024]; char link_type_string[1024];
@ -262,15 +216,15 @@ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_f
else{ else{
snprintf(link_type_string, sizeof(link_type_string), "/NODEFAULTLIB:library"); snprintf(link_type_string, sizeof(link_type_string), "/NODEFAULTLIB:library");
} }
build_ap(link_line, "%s", link_type_string); fm_add_to_line(link_line, "%s", link_type_string);
for (u32 i = 0; code_files[i]; ++i){ for (u32 i = 0; code_files[i]; ++i){
build_ap(line, "\"%s\\%s\"", code_path, code_files[i]); fm_add_to_line(line, "\"%s\\%s\"", code_path, code_files[i]);
} }
swap_ptr(&line.build_options, &line.build_options_prev); fm_finish_build_line(&line);
swap_ptr(&link_line.build_options, &link_line.build_options_prev); fm_finish_build_line(&link_line);
swap_ptr(&line_prefix.build_options, &line_prefix.build_options_prev); fm_finish_build_line(&line_prefix);
Temp_Dir temp = fm_pushdir(out_path); Temp_Dir temp = fm_pushdir(out_path);
systemf("%scl %s /Fe%s /link /INCREMENTAL:NO %s", line_prefix.build_options, line.build_options, out_file, link_line.build_options); systemf("%scl %s /Fe%s /link /INCREMENTAL:NO %s", line_prefix.build_options, line.build_options, out_file, link_line.build_options);
@ -319,17 +273,17 @@ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_f
static void static void
build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_file, char *exports, char **inc_folders){ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_file, char *exports, char **inc_folders){
Build_Line line; Build_Line line;
init_build_line(&line); fm_init_build_line(&line);
if (flags & X86){ if (flags & X86){
build_ap(line, GCC_X86); fm_add_to_line(line, GCC_X86);
} }
else{ else{
build_ap(line, GCC_X64); fm_add_to_line(line, GCC_X64);
} }
if (flags & OPTS){ if (flags & OPTS){
build_ap(line, GCC_OPTS); fm_add_to_line(line, GCC_OPTS);
} }
if (flags & INCLUDES){ if (flags & INCLUDES){
@ -344,60 +298,60 @@ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_f
pclose(file); pclose(file);
} }
build_ap(line, GCC_INCLUDES" %s", freetype_include); fm_add_to_line(line, GCC_INCLUDES" %s", freetype_include);
#else #else
build_ap(line, GCC_INCLUDES); fm_add_to_line(line, GCC_INCLUDES);
#endif #endif
} }
if (flags & SITE_INCLUDES){ if (flags & SITE_INCLUDES){
build_ap(line, GCC_SITE_INCLUDES); fm_add_to_line(line, GCC_SITE_INCLUDES);
} }
if (inc_folders != 0){ if (inc_folders != 0){
for (u32 i = 0; inc_folders[i] != 0; ++i){ for (u32 i = 0; inc_folders[i] != 0; ++i){
build_ap(line, "-I%s/%s", code_path, inc_folders[i]); fm_add_to_line(line, "-I%s/%s", code_path, inc_folders[i]);
} }
} }
if (flags & DEBUG_INFO){ if (flags & DEBUG_INFO){
build_ap(line, "-g -O0"); fm_add_to_line(line, "-g -O0");
} }
if (flags & OPTIMIZATION){ if (flags & OPTIMIZATION){
build_ap(line, "-O3"); fm_add_to_line(line, "-O3");
} }
if (flags & SHARED_CODE){ if (flags & SHARED_CODE){
build_ap(line, "-shared"); fm_add_to_line(line, "-shared");
} }
if (flags & LOG){ if (flags & LOG){
build_ap(line, "-DUSE_LOG -DUSE_LOGF"); fm_add_to_line(line, "-DUSE_LOG -DUSE_LOGF");
} }
if (flags & SUPER){ if (flags & SUPER){
build_ap(line, "-DFRED_SUPER"); fm_add_to_line(line, "-DFRED_SUPER");
} }
if (flags & INTERNAL){ if (flags & INTERNAL){
build_ap(line, "-DFRED_INTERNAL"); fm_add_to_line(line, "-DFRED_INTERNAL");
} }
if (flags & KEEP_ASSERT){ if (flags & KEEP_ASSERT){
build_ap(line, "-DFRED_KEEP_ASSERT"); fm_add_to_line(line, "-DFRED_KEEP_ASSERT");
} }
build_ap(line, "-I\"%s\"", code_path); fm_add_to_line(line, "-I\"%s\"", code_path);
for (u32 i = 0; code_files[i] != 0; ++i){ for (u32 i = 0; code_files[i] != 0; ++i){
build_ap(line, "\"%s/%s\"", code_path, code_files[i]); fm_add_to_line(line, "\"%s/%s\"", code_path, code_files[i]);
} }
if (flags & LIBS){ if (flags & LIBS){
build_ap(line, GCC_LIBS); fm_add_to_line(line, GCC_LIBS);
} }
swap_ptr(&line.build_options, &line.build_options_prev); fm_finish_build_line(&line);
Temp_Dir temp = fm_pushdir(out_path); Temp_Dir temp = fm_pushdir(out_path);
systemf("g++ %s -o %s", line.build_options, out_file); systemf("g++ %s -o %s", line.build_options, out_file);
@ -418,66 +372,57 @@ build(u32 flags, char *code_path, char *code_file, char *out_path, char *out_fil
} }
static void static void
buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){ build_and_run(char *cdir, char *filename, char *name, u32 flags){
Temp_Dir temp = fm_pushdir(out_path); char *dir = fm_str(BUILD_DIR);
#if defined(IS_CL)
{ {
char *prefix_1 = ""; char *file = fm_str(filename);
char *prefix_2 = ""; BEGIN_TIME_SECTION();
char *build_script = "buildsuper.bat"; build(flags, cdir, file, dir, name, 0, 0);
if (x86_build){ END_TIME_SECTION(fm_str("build ", name));
prefix_1 = code_path;
prefix_2 = "\\windows_scripts\\setup_cl_x86.bat & ";
build_script = "buildsuper_x86.bat";
}
systemf("%s%scall \"%s\\%s\" %s", prefix_1, prefix_2, code_path, build_script, filename);
} }
#elif defined(IS_GCC)
{ if (prev_error == 0){
systemf("\"%s/buildsuper.sh\" \"%s\"", code_path, filename); char *cmd = fm_str(dir, "/", name);
BEGIN_TIME_SECTION();
fm_execute_in_dir(cdir, cmd, 0);
END_TIME_SECTION(fm_str("run ", name));
} }
#else
# error The build rule for this compiler is not ready
#endif
fm_popdir(temp);
} }
static void static void
fsm_generator(char *cdir){ fsm_generator(char *cdir){
{ build_and_run(cdir, "meta/fsm_table_generator.cpp", "fsmgen", OPTS | DEBUG_INFO);
char *file = fm_prepare_string("meta/fsm_table_generator.cpp", 0);
char *dir = fm_prepare_string(BUILD_DIR, 0);
BEGIN_TIME_SECTION();
build(OPTS | DEBUG_INFO, cdir, file, dir, "fsmgen", 0, 0);
END_TIME_SECTION("build fsm generator");
}
if (prev_error == 0){
char *cmd = fm_prepare_string(BUILD_DIR"/fsmgen", 0);
BEGIN_TIME_SECTION();
fm_execute_in_dir(cdir, cmd, 0);
END_TIME_SECTION("run fsm generator");
}
} }
static void static void
metagen(char *cdir){ metagen(char *cdir){
build_and_run(cdir, "meta/4ed_metagen.cpp", "metagen", OPTS | DEBUG_INFO | INCLUDES);
}
static void
buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){
Temp_Dir temp = fm_pushdir(out_path);
#if defined(IS_WINDOWS)
{ {
char *file = fm_prepare_string("meta/4ed_metagen.cpp", 0); char *build_script = "buildsuper.bat";
char *dir = fm_prepare_string(BUILD_DIR, 0); if (x86_build){
build_script = "buildsuper_x86.bat";
BEGIN_TIME_SECTION(); }
build(OPTS | INCLUDES | DEBUG_INFO, cdir, file, dir, "metagen", 0, 0); systemf("call \"%s\\%s\" \"%s\"", code_path, build_script, filename);
END_TIME_SECTION("build metagen");
} }
#elif defined(IS_LINUX) || defined(IS_MAC)
if (prev_error == 0){ {
char *cmd = fm_prepare_string(BUILD_DIR"/metagen", 0); char *build_script = "buildsuper.sh";
BEGIN_TIME_SECTION(); if (x86_build){
fm_execute_in_dir(cdir, cmd, 0); build_script = "buildsuper_x86.sh";
END_TIME_SECTION("run metagen"); }
systemf("\"%s/%s\" \"%s\"", code_path, build_script, filename);
} }
#else
# error The buildsuper rule for this OS is not ready
#endif
fm_popdir(temp);
} }
enum{ enum{
@ -490,51 +435,46 @@ enum{
static void static void
do_buildsuper(char *cdir, i32 custom_option, u32 flags){ do_buildsuper(char *cdir, i32 custom_option, u32 flags){
char space[1024];
String str = make_fixed_width_string(space);
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
char *str = 0;
switch (custom_option){ switch (custom_option){
case Custom_Default: case Custom_Default:
{ {
copy_sc(&str, "../code/4coder_default_bindings.cpp"); str = fm_str("../code/4coder_default_bindings.cpp");
}break; }break;
case Custom_Experiments: case Custom_Experiments:
{ {
copy_sc(&str, "../code/power/4coder_experiments.cpp"); str = fm_str("../code/power/4coder_experiments.cpp");
}break; }break;
case Custom_Casey: case Custom_Casey:
{ {
copy_sc(&str, "../code/power/4coder_casey.cpp"); str = fm_str("../code/power/4coder_casey.cpp");
}break; }break;
case Custom_ChronalVim: case Custom_ChronalVim:
{ {
copy_sc(&str, "../4vim/4coder_chronal.cpp"); str = fm_str("../4vim/4coder_chronal.cpp");
}break; }break;
} }
terminate_with_null(&str);
b32 x86_build = false; if (str != 0){
if (flags & X86){ b32 x86_build = ((flags & X86) != 0);
x86_build = true; char *dir = fm_str(BUILD_DIR);
buildsuper(cdir, dir, str
, x86_build);
END_TIME_SECTION("build custom");
} }
char *dir = fm_prepare_string(BUILD_DIR, 0);
buildsuper(cdir, dir, str.str, x86_build);
END_TIME_SECTION("build custom");
} }
static void static void
build_main(char *cdir, u32 flags){ build_main(char *cdir, u32 flags){
char *dir = fm_prepare_string(BUILD_DIR); char *dir = fm_str(BUILD_DIR);
{ {
char *file = fm_prepare_string("4ed_app_target.cpp"); char *file = fm_str("4ed_app_target.cpp");
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
build(OPTS | INCLUDES | SHARED_CODE | flags, cdir, file, dir, "4ed_app" DLL, "/EXPORT:app_get_functions", 0); build(OPTS | INCLUDES | SHARED_CODE | flags, cdir, file, dir, "4ed_app" DLL, "/EXPORT:app_get_functions", 0);
END_TIME_SECTION("build 4ed_app"); END_TIME_SECTION("build 4ed_app");
@ -548,10 +488,10 @@ build_main(char *cdir, u32 flags){
{ {
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
char *themes_folder = fm_prepare_string("../build/themes"); char *themes_folder = fm_str("../build/themes");
char *source_themes_folder = fm_prepare_string("themes"); char *source_themes_folder = fm_str("themes");
fm_clear_folder(themes_folder); fm_clear_folder(themes_folder);
fm_make_folder_if_missing(themes_folder, 0); fm_make_folder_if_missing(themes_folder);
fm_copy_all(source_themes_folder, "*", themes_folder); fm_copy_all(source_themes_folder, "*", themes_folder);
END_TIME_SECTION("move files"); END_TIME_SECTION("move files");
} }
@ -571,8 +511,8 @@ standard_build(char *cdir, u32 flags){
static void static void
site_build(char *cdir, u32 flags){ site_build(char *cdir, u32 flags){
{ {
char *file = fm_prepare_string("site/sitegen.cpp"); char *file = fm_str("site/sitegen.cpp");
char *dir = fm_prepare_string(BUILD_DIR"/site"); char *dir = fm_str(BUILD_DIR"/site");
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
build(OPTS | SITE_INCLUDES | flags, cdir, file, dir, "sitegen", 0, 0); build(OPTS | SITE_INCLUDES | flags, cdir, file, dir, "sitegen", 0, 0);
END_TIME_SECTION("build sitegen"); END_TIME_SECTION("build sitegen");
@ -580,7 +520,7 @@ site_build(char *cdir, u32 flags){
{ {
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
char *cmd = fm_prepare_string("../build/site/sitegen . ../site_resources site/source_material ../site"); char *cmd = fm_str("../build/site/sitegen . ../site_resources site/source_material ../site");
systemf("%s", cmd); systemf("%s", cmd);
END_TIME_SECTION("run sitegen"); END_TIME_SECTION("run sitegen");
} }
@ -643,10 +583,10 @@ package(char *cdir){
#define SITE_DIR "../site" #define SITE_DIR "../site"
#define PACK_FONTS_DIR "../code/dist_files/fonts" #define PACK_FONTS_DIR "../code/dist_files/fonts"
char *build_dir = fm_prepare_string(BUILD_DIR); char *build_dir = fm_str(BUILD_DIR);
char *site_dir = fm_prepare_string(SITE_DIR); char *site_dir = fm_str(SITE_DIR);
char *pack_dir = fm_prepare_string(PACK_DIR); char *pack_dir = fm_str(PACK_DIR);
char *pack_fonts_dir = fm_prepare_string(PACK_FONTS_DIR); char *pack_fonts_dir = fm_str(PACK_FONTS_DIR);
u32 arch_count = 2; u32 arch_count = 2;
char *arch_names[] = { char *arch_names[] = {
@ -669,30 +609,30 @@ package(char *cdir){
char *tier = "alpha"; char *tier = "alpha";
char *tier_package_root = fm_prepare_string(base_package_root, "_", tier); char *tier_package_root = fm_str(base_package_root, "_", tier);
u32 base_flags = OPTIMIZATION | KEEP_ASSERT | DEBUG_INFO | LOG; u32 base_flags = OPTIMIZATION | KEEP_ASSERT | DEBUG_INFO | LOG;
for (u32 i = 0; i < arch_count; ++i){ for (u32 i = 0; i < arch_count; ++i){
char *package_root = fm_prepare_string(tier_package_root, "_", arch_names[i]); char *package_root = fm_str(tier_package_root, "_", arch_names[i]);
char *par_dir = fm_prepare_string(package_root); char *par_dir = fm_str(package_root);
char *dir = fm_prepare_string(par_dir, "/4coder"); char *dir = fm_str(par_dir, "/4coder");
char *fonts_dir = fm_prepare_string(dir, "/fonts"); char *fonts_dir = fm_str(dir, "/fonts");
char *zip_dir = fm_prepare_string(tier, "_", arch_names[i]); char *zip_dir = fm_str(tier, "_", arch_names[i]);
build_main(cdir, base_flags | arch_flags[i]); build_main(cdir, base_flags | arch_flags[i]);
fm_clear_folder(par_dir); fm_clear_folder(par_dir);
fm_make_folder_if_missing(dir, 0); fm_make_folder_if_missing(dir);
fm_make_folder_if_missing(dir, "fonts"); fm_make_folder_if_missing(fonts_dir);
fm_make_folder_if_missing(pack_dir, zip_dir); fm_make_folder_if_missing(fm_str(pack_dir, "/", zip_dir));
fm_copy_file(build_dir, "4ed" EXE, dir, 0, 0); fm_copy_file(fm_str(build_dir, "/4ed"EXE), fm_str(dir, "/4ed"EXE));
fm_copy_file(build_dir, "4ed_app" DLL, dir, 0, 0); fm_copy_file(fm_str(build_dir, "/4ed_app"DLL), fm_str(dir, "/4ed_app"DLL));
fm_copy_all(pack_fonts_dir, "*", fonts_dir); fm_copy_all(pack_fonts_dir, "*", fonts_dir);
fm_copy_file(cdir, "release-config.4coder", dir, 0, "config.4coder"); fm_copy_file(fm_str(cdir, "/release-config.4coder"), fm_str(dir, "/config.4coder"));
fm_copy_folder(dir, "themes"); fm_copy_folder(dir, "themes");
fm_copy_file(cdir, "LICENSE.txt", dir, 0, 0); fm_copy_file(fm_str(cdir, "/LICENSE.txt"), fm_str(dir, "/LICENSE.txt"));
fm_copy_file(cdir, "README.txt", dir, 0, 0); fm_copy_file(fm_str(cdir, "/README.txt"), fm_str(dir, "/README.txt"));
get_4coder_dist_name(&str, true, zip_dir, tier, arch_names[i], "zip"); get_4coder_dist_name(&str, true, zip_dir, tier, arch_names[i], "zip");
fm_zip(par_dir, "4coder", str.str); fm_zip(par_dir, "4coder", str.str);
@ -708,37 +648,38 @@ package(char *cdir){
char *tier = "super"; char *tier = "super";
char *tier_package_root = fm_prepare_string(base_package_root, "_", tier); char *tier_package_root = fm_str(base_package_root, "_", tier);
u32 base_flags = OPTIMIZATION | KEEP_ASSERT | DEBUG_INFO | LOG | SUPER; u32 base_flags = OPTIMIZATION | KEEP_ASSERT | DEBUG_INFO | LOG | SUPER;
for (u32 i = 0; i < arch_count; ++i){ for (u32 i = 0; i < arch_count; ++i){
char *package_root = fm_prepare_string(tier_package_root, "_", arch_names[i]); char *package_root = fm_str(tier_package_root, "_", arch_names[i]);
char *par_dir = fm_prepare_string(package_root); char *par_dir = fm_str(package_root);
char *dir = fm_prepare_string(par_dir, "/4coder"); char *dir = fm_str(par_dir, "/4coder");
char *fonts_dir = fm_prepare_string(dir, "/fonts"); char *fonts_dir = fm_str(dir, "/fonts");
char *zip_dir = fm_prepare_string(tier, "_", arch_names[i]); char *zip_dir = fm_str(tier, "_", arch_names[i]);
build_main(cdir, base_flags | arch_flags[i]); build_main(cdir, base_flags | arch_flags[i]);
do_buildsuper(cdir, Custom_Default, arch_flags[i]); do_buildsuper(cdir, Custom_Default, arch_flags[i]);
fm_clear_folder(par_dir); fm_clear_folder(par_dir);
fm_make_folder_if_missing(dir, 0); fm_make_folder_if_missing(dir);
fm_make_folder_if_missing(dir, "fonts"); fm_make_folder_if_missing(fonts_dir);
fm_make_folder_if_missing(pack_dir, zip_dir); fm_make_folder_if_missing(fm_str(pack_dir, "/", zip_dir));
fm_copy_file(fm_str(build_dir, "/4ed" EXE), fm_str(dir, "/4ed" EXE));
fm_copy_file(build_dir, "4ed" EXE, dir, 0, 0); fm_copy_file(fm_str(build_dir, "/4ed_app" DLL), fm_str(dir, "/4ed_app" DLL));
fm_copy_file(build_dir, "4ed_app" DLL, dir, 0, 0); fm_copy_file(fm_str(build_dir, "/custom_4coder" DLL), fm_str(dir, "/custom_4coder" DLL));
fm_copy_file(build_dir, "custom_4coder" DLL, dir, 0, 0);
fm_copy_all(pack_fonts_dir, "*", fonts_dir); fm_copy_all(pack_fonts_dir, "*", fonts_dir);
fm_copy_file(cdir, "release-config.4coder", dir, 0, "config.4coder"); fm_copy_file(fm_str(cdir, "/release-config.4coder"), fm_str(dir, "/config.4coder"));
fm_copy_all(0, "4coder_*", dir); fm_copy_all(0, "4coder_*", dir);
if (!(arch_flags[i] & X86)){ if (!(arch_flags[i] & X86)){
fm_copy_file(0, "buildsuper" BAT, dir, 0, "buildsuper" BAT); fm_copy_file("buildsuper" BAT, fm_str(dir, "/buildsuper" BAT));
} }
else{ else{
fm_copy_file(0, "buildsuper_x86" BAT, dir, 0, "buildsuper" BAT); fm_copy_file("buildsuper_x86" BAT, fm_str(dir, "/buildsuper" BAT));
} }
#if defined(IS_WINDOWS) #if defined(IS_WINDOWS)
fm_copy_folder(dir, "windows_scripts"); fm_copy_folder(dir, "windows_scripts");
@ -751,17 +692,17 @@ package(char *cdir){
fm_copy_folder(dir, "languages"); fm_copy_folder(dir, "languages");
fm_copy_folder(dir, "themes"); fm_copy_folder(dir, "themes");
fm_copy_file(cdir, "LICENSE.txt", dir, 0, 0); fm_copy_file(fm_str(cdir, "/LICENSE.txt"), fm_str(dir, "/LICENSE.txt"));
fm_copy_file(cdir, "README.txt", dir, 0, 0); fm_copy_file(fm_str(cdir, "/README.txt"), fm_str(dir, "/README.txt"));
get_4coder_dist_name(&str, true, zip_dir, tier, arch_names[i], "zip"); get_4coder_dist_name(&str, true, zip_dir, tier, arch_names[i], "zip");
fm_zip(par_dir, "4coder", str.str); fm_zip(par_dir, "4coder", str.str);
} }
fm_make_folder_if_missing(pack_dir, "super-docs"); fm_make_folder_if_missing(fm_str(pack_dir, "/super-docs"));
get_4coder_dist_name(&str, false, "super-docs", "API", 0, "html"); get_4coder_dist_name(&str, false, "super-docs", "API", 0, "html");
String str2 = front_of_directory(str); String str2 = front_of_directory(str);
fm_copy_file(site_dir, "custom_docs.html", pack_dir, "super-docs", str2.str); fm_copy_file(fm_str(site_dir, "/custom_docs.html"), fm_str(pack_dir, "/super-docs/", str2.str));
fm_end_temp(temp); fm_end_temp(temp);
} }
@ -770,12 +711,12 @@ package(char *cdir){
{ {
Temp_Memory temp = fm_begin_temp(); Temp_Memory temp = fm_begin_temp();
char *pack_power_par_dir = fm_prepare_string("../current_dist_power"); char *pack_power_par_dir = fm_str("../current_dist_power");
char *pack_power_dir = fm_prepare_string(pack_power_par_dir, "/power"); char *pack_power_dir = fm_str(pack_power_par_dir, "/power");
fm_clear_folder(pack_power_par_dir); fm_clear_folder(pack_power_par_dir);
fm_make_folder_if_missing(pack_power_dir, 0); fm_make_folder_if_missing(pack_power_dir);
fm_make_folder_if_missing(pack_dir, "power"); fm_make_folder_if_missing(fm_str(pack_dir, "/power"));
fm_copy_all("power", "*", pack_power_dir); fm_copy_all("power", "*", pack_power_dir);
get_4coder_dist_name(&str, 0, "power", "power", 0, "zip"); get_4coder_dist_name(&str, 0, "power", "power", 0, "zip");
@ -787,7 +728,7 @@ package(char *cdir){
int main(int argc, char **argv){ int main(int argc, char **argv){
fm_init_system(); fm_init_system();
char cdir[256]; char cdir[256];
BEGIN_TIME_SECTION(); BEGIN_TIME_SECTION();
@ -807,6 +748,7 @@ int main(int argc, char **argv){
#elif defined(PACKAGE) #elif defined(PACKAGE)
package(cdir); package(cdir);
#elif defined(SITE_BUILD) #elif defined(SITE_BUILD)
site_build(cdir, DEBUG_INFO); site_build(cdir, DEBUG_INFO);
@ -822,4 +764,3 @@ int main(int argc, char **argv){
// BOTTOM // BOTTOM

0
package.sh Normal file → Executable file
View File