site fixup

master
Allen Webster 2017-01-30 12:30:03 -05:00
parent 72518cf5e8
commit 7dc483c8f6
5 changed files with 19 additions and 16 deletions

Binary file not shown.

View File

@ -462,10 +462,8 @@ site_build(char *cdir, u32 flags){
{
BEGIN_TIME_SECTION();
DECL_STR(cmd, "../build/site/sitegen . ../site_resources site/source_material ../site");
systemf("%s", cmd);
END_TIME_SECTION("run sitegen");
}
}

View File

@ -1220,7 +1220,6 @@ compile_meta_unit(Partition *part, char *code_directory, char **files, Meta_Keyw
}
}
if (all_files_lexed){
// TODO(allen): This stage counts nested structs and unions which is not correct. Luckily it only means we over allocate by a few items, but fixing it to be exactly correct would be nice.
for (int32_t J = 0; J < unit.count; ++J){

View File

@ -15,4 +15,5 @@ popd
..\build\build
if %ERRORLEVEL% neq 0 (set FirstError=1)
call "ctime" -end 4ed_site.ctm %FirstError%
call "ctime" -end 4ed_site.ctm %FirstError%

View File

@ -21,6 +21,8 @@
#include <string.h>
#include "../4tech_defines.h"
#include "../meta/4tech_meta_defines.h"
#include "../4coder_API/version.h"
#define FSTRING_IMPLEMENTATION
#include "../4coder_lib/4coder_string.h"
@ -185,22 +187,21 @@ generate_4coder_docs(Document_System *doc_system, Partition *part, char *code_di
Enriched_Text *introduction = push_struct(part, Enriched_Text);
Enriched_Text *lexer_introduction = push_struct(part, Enriched_Text);
// NOTE(allen): Parse the important code.
*custom_types_unit = compile_meta_unit(part, code_directory, "4coder_types.h", ExpandArray(meta_keywords));
// NOTE(allen): Parse the code.
*custom_types_unit = compile_meta_unit(part, code_directory, "4coder_API/types.h", ExpandArray(meta_keywords));
Assert(custom_types_unit->count != 0);
*lexer_funcs_unit = compile_meta_unit(part, code_directory, "4cpp_lexer.h", ExpandArray(meta_keywords));
*lexer_funcs_unit = compile_meta_unit(part, code_directory, "4cpp/4cpp_lexer.h", ExpandArray(meta_keywords));
Assert(lexer_funcs_unit->count != 0);
*lexer_types_unit = compile_meta_unit(part, code_directory, "4cpp_lexer_types.h", ExpandArray(meta_keywords));
*lexer_types_unit = compile_meta_unit(part, code_directory, "4cpp/4cpp_lexer_types.h", ExpandArray(meta_keywords));
Assert(lexer_types_unit->count != 0);
*string_unit = compile_meta_unit(part, code_directory, "internal_4coder_string.cpp", ExpandArray(meta_keywords));
*string_unit = compile_meta_unit(part, code_directory, "string/internal_4coder_string.cpp", ExpandArray(meta_keywords));
Assert(string_unit->count != 0);
static char *functions_files[] = {
"4ed_api_implementation.cpp",
"win32_api_impl.cpp",
0
};
*custom_funcs_unit = compile_meta_unit(part, code_directory, functions_files, ExpandArray(meta_keywords));
*custom_funcs_unit = compile_meta_unit(part, code_directory, "4ed_api_implementation.cpp", ExpandArray(meta_keywords));
Assert(custom_funcs_unit->count != 0);
// NOTE(allen): Compute and store variations of the custom function names
@ -456,9 +457,13 @@ generate_site(char *code_directory, char *asset_directory, char *src_directory,
}
int main(int argc, char **argv){
META_BEGIN();
if (argc == 5){
generate_site(argv[1], argv[2], argv[3], argv[4]);
}
META_FINISH();
}
// BOTTOM