From 327e3236ae1c454b23581647674ab27f6256ebee Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Mon, 8 Oct 2018 11:56:49 +0200 Subject: [PATCH] rename generated folder to output folder --- generator/generator.bat | 4 +-- generator/generator.lua | 28 +++++++++---------- generator/{generated => output}/cimgui.cpp | 0 generator/{generated => output}/cimgui.h | 0 generator/{generated => output}/cimgui_impl.h | 0 .../cimgui_nopreprocess.cpp | 0 .../cimgui_nopreprocess.h | 0 .../{generated => output}/definitions.json | 0 .../{generated => output}/definitions.lua | 0 .../impl_definitions.json | 0 .../impl_definitions.lua | 0 generator/{generated => output}/overloads.txt | 0 .../structs_and_enums.json | 0 .../structs_and_enums.lua | 0 .../{generated => output}/typedefs_dict.json | 0 .../{generated => output}/typedefs_dict.lua | 0 16 files changed, 16 insertions(+), 16 deletions(-) rename generator/{generated => output}/cimgui.cpp (100%) rename generator/{generated => output}/cimgui.h (100%) rename generator/{generated => output}/cimgui_impl.h (100%) rename generator/{generated => output}/cimgui_nopreprocess.cpp (100%) rename generator/{generated => output}/cimgui_nopreprocess.h (100%) rename generator/{generated => output}/definitions.json (100%) rename generator/{generated => output}/definitions.lua (100%) rename generator/{generated => output}/impl_definitions.json (100%) rename generator/{generated => output}/impl_definitions.lua (100%) rename generator/{generated => output}/overloads.txt (100%) rename generator/{generated => output}/structs_and_enums.json (100%) rename generator/{generated => output}/structs_and_enums.lua (100%) rename generator/{generated => output}/typedefs_dict.json (100%) rename generator/{generated => output}/typedefs_dict.lua (100%) diff --git a/generator/generator.bat b/generator/generator.bat index f88b650..6ddf894 100644 --- a/generator/generator.bat +++ b/generator/generator.bat @@ -1,8 +1,8 @@ :: this script must be executed in this directory -:: all the output goes to generated folder +:: all the output goes to generator/output folder :: .cpp and .h files: -:: cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess :: cimgui.h and cimgui.cpp with gcc preprocess +:: cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess :: cimgui_impl.h with implementation function cdefs :: lua and json files: :: definitions.lua for function definitions diff --git a/generator/generator.lua b/generator/generator.lua index 821833c..0f7961a 100644 --- a/generator/generator.lua +++ b/generator/generator.lua @@ -1218,7 +1218,7 @@ local function cimgui_generation(postfix,STP,FP) hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr) local cfuncsstr = func_header_generate(FP) hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr) - save_data("./generated/cimgui"..postfix..".h",cimgui_header,hstrfile) + save_data("./output/cimgui"..postfix..".h",cimgui_header,hstrfile) --merge it in cimgui_template.cpp to cimgui.cpp @@ -1228,7 +1228,7 @@ local function cimgui_generation(postfix,STP,FP) hfile:close() hstrfile = hstrfile:gsub([[#include "auto_funcs%.cpp"]],cimplem) hstrfile = hstrfile:gsub([[#include "cimgui%.h"]],[[#include "cimgui]]..postfix..[[.h"]]) - save_data("./generated/cimgui"..postfix..".cpp",cimgui_header,hstrfile) + save_data("./output/cimgui"..postfix..".cpp",cimgui_header,hstrfile) return typedefs_dict end -------------------------------------------------------- @@ -1289,20 +1289,20 @@ end pipe:close() local ovstr = pFP:compute_overloads() ADDnonUDT(pFP) -save_data("./generated/overloads.txt",ovstr) +save_data("./output/overloads.txt",ovstr) typedefs_dict2 = cimgui_generation("",pSTP,pFP) --check arg detection failure if no name in function declaration check_arg_detection(pFP.defsT,typedefs_dict2) end ----------save fundefs in definitions.lua for using in bindings -save_data("./generated/definitions.lua",serializeTable("defs",pFP.defsT),"\nreturn defs") +save_data("./output/definitions.lua",serializeTable("defs",pFP.defsT),"\nreturn defs") ----------save struct and enums lua table in structs_and_enums.lua for using in bindings local structs_and_enums_table,typedefs_dict = gen_structs_and_enums_table(pSTP.lines) -save_data("./generated/structs_and_enums.lua",serializeTable("defs",structs_and_enums_table),"\nreturn defs") +save_data("./output/structs_and_enums.lua",serializeTable("defs",structs_and_enums_table),"\nreturn defs") typedefs_dict = mergeT(typedefs_dict,typedefs_dict2) -save_data("./generated/typedefs_dict.lua",serializeTable("defs",typedefs_dict),"\nreturn defs") +save_data("./output/typedefs_dict.lua",serializeTable("defs",typedefs_dict),"\nreturn defs") --=================================Now implementations local iFP,iSTP @@ -1338,10 +1338,10 @@ if #implementations > 0 then -- save ./cimgui_impl.h local cfuncsstr = func_header_impl_generate(iFP) local cstructstr = gen_structs_and_enums(iSTP.lines) - save_data("./generated/cimgui_impl.h",cstructstr,cfuncsstr) + save_data("./output/cimgui_impl.h",cstructstr,cfuncsstr) ----------save fundefs in impl_definitions.lua for using in bindings - save_data("./generated/impl_definitions.lua",serializeTable("defs",iFP.defsT),"\nreturn defs") + save_data("./output/impl_definitions.lua",serializeTable("defs",iFP.defsT),"\nreturn defs") end -- #implementations > 0 then @@ -1360,15 +1360,15 @@ local function json_prepare(defs) end local json = require"json" -save_data("./generated/definitions.json",json.encode(json_prepare(pFP.defsT))) -save_data("./generated/structs_and_enums.json",json.encode(structs_and_enums_table)) -save_data("./generated/typedefs_dict.json",json.encode(typedefs_dict)) +save_data("./output/definitions.json",json.encode(json_prepare(pFP.defsT))) +save_data("./output/structs_and_enums.json",json.encode(structs_and_enums_table)) +save_data("./output/typedefs_dict.json",json.encode(typedefs_dict)) if iFP then - save_data("./generated/impl_definitions.json",json.encode(json_prepare(iFP.defsT))) + save_data("./output/impl_definitions.json",json.encode(json_prepare(iFP.defsT))) end -copyfile("./generated/cimgui.h", "../cimgui.h") -copyfile("./generated/cimgui.cpp", "../cimgui.cpp") +copyfile("./output/cimgui.h", "../cimgui.h") +copyfile("./output/cimgui.cpp", "../cimgui.cpp") print"all done!!" --[[ ---dump some infos----------------------------------------------------------------------- diff --git a/generator/generated/cimgui.cpp b/generator/output/cimgui.cpp similarity index 100% rename from generator/generated/cimgui.cpp rename to generator/output/cimgui.cpp diff --git a/generator/generated/cimgui.h b/generator/output/cimgui.h similarity index 100% rename from generator/generated/cimgui.h rename to generator/output/cimgui.h diff --git a/generator/generated/cimgui_impl.h b/generator/output/cimgui_impl.h similarity index 100% rename from generator/generated/cimgui_impl.h rename to generator/output/cimgui_impl.h diff --git a/generator/generated/cimgui_nopreprocess.cpp b/generator/output/cimgui_nopreprocess.cpp similarity index 100% rename from generator/generated/cimgui_nopreprocess.cpp rename to generator/output/cimgui_nopreprocess.cpp diff --git a/generator/generated/cimgui_nopreprocess.h b/generator/output/cimgui_nopreprocess.h similarity index 100% rename from generator/generated/cimgui_nopreprocess.h rename to generator/output/cimgui_nopreprocess.h diff --git a/generator/generated/definitions.json b/generator/output/definitions.json similarity index 100% rename from generator/generated/definitions.json rename to generator/output/definitions.json diff --git a/generator/generated/definitions.lua b/generator/output/definitions.lua similarity index 100% rename from generator/generated/definitions.lua rename to generator/output/definitions.lua diff --git a/generator/generated/impl_definitions.json b/generator/output/impl_definitions.json similarity index 100% rename from generator/generated/impl_definitions.json rename to generator/output/impl_definitions.json diff --git a/generator/generated/impl_definitions.lua b/generator/output/impl_definitions.lua similarity index 100% rename from generator/generated/impl_definitions.lua rename to generator/output/impl_definitions.lua diff --git a/generator/generated/overloads.txt b/generator/output/overloads.txt similarity index 100% rename from generator/generated/overloads.txt rename to generator/output/overloads.txt diff --git a/generator/generated/structs_and_enums.json b/generator/output/structs_and_enums.json similarity index 100% rename from generator/generated/structs_and_enums.json rename to generator/output/structs_and_enums.json diff --git a/generator/generated/structs_and_enums.lua b/generator/output/structs_and_enums.lua similarity index 100% rename from generator/generated/structs_and_enums.lua rename to generator/output/structs_and_enums.lua diff --git a/generator/generated/typedefs_dict.json b/generator/output/typedefs_dict.json similarity index 100% rename from generator/generated/typedefs_dict.json rename to generator/output/typedefs_dict.json diff --git a/generator/generated/typedefs_dict.lua b/generator/output/typedefs_dict.lua similarity index 100% rename from generator/generated/typedefs_dict.lua rename to generator/output/typedefs_dict.lua