commit 998c4dc3a8296067fe2cca906a9ecb67b8f26712 parent f6394998f38cd4f7a9f487cc16d5b0337ac4a8b1 Author: Kyle Milz <kyle@0x30.net> Date: Mon, 2 Jan 2017 18:26:50 -0700 src: is no more Diffstat:
67 files changed, 114 insertions(+), 147 deletions(-)
diff --git a/Jamfile b/Jamfile @@ -1,33 +1,117 @@ -SubDir TOP ; +SubDir TOP src ; -SubInclude TOP man ; -SubInclude TOP src ; +# +# libcitrun +# +ObjectCcFlags lib.c : -fPIC -ansi ; +Library libcitrun : lib.c ; # -# Different build modifiers. Put them here because it only makes sense to run -# them from the root directory. +# citrun_check # -actions StaticAnalysis -{ - scan-build ./configure - scan-build -o html --use-c++=eg++ jam -j4 +MakeLocate citrun_check : $(LOCATE_SOURCE) ; +Shell citrun_check : check.sh ; + +# +# citrun_wrap +# +ObjectDefines wrap.cc : CITRUN_SHARE=\\\"$(CITRUN_SHARE)\\\" ; +Main citrun_wrap : wrap.cc ; + +# +# citrun_term +# +#LINKLIBS on citrun_term += -lcurses ; +#Main citrun_term : term_main.cc ; + +# +# citrun_gl & citrun_gltest +# +GL_SRCS = + gl_procfile.cc + gl_transunit.cc + process_dir.cc + gl_view.cc + demo-atlas.cc + gl_buffer.cc + gl_font.cc + demo-glstate.cc + demo-shader.cc + matrix4x4.c ; + +Library gl_common : $(GL_SRCS) ; + +Stringize demo_atlas_glsl.h : demo_atlas.glsl ; +Stringize demo_vshader_glsl.h : demo_vshader.glsl ; +Stringize demo_fshader_glsl.h : demo_fshader.glsl ; + +ObjectDefines gl_font.cc : FONT_PATH=\\\"$(FONT_PATH)\\\" ; +ObjectC++Flags gl_main.cc gl_testmain.cc $(GL_SRCS) : $(GL_CFLAGS) ; + +LINKLIBS on citrun_gl citrun_gltest += -lm $(GL_LIBS) ; +LinkLibraries citrun_gl citrun_gltest : gl_common libglyphy ; + +Main citrun_gl : gl_main.cc ; + +LINKLIBS on citrun_gltest += $(GLTEST_LIBS) ; +Main citrun_gltest : gl_testmain.cc ; + +# +# citrun_inst +# +INST_SRCS = + inst_main.cc + inst_frontend.cc + inst_action.cc + inst_visitor.cc ; + +Stringize lib_h.h : lib.h ; + +ObjectC++Flags $(INST_SRCS) : $(INST_CFLAGS) ; +ObjectDefines $(INST_SRCS) : CITRUN_SHARE=\\\"$(CITRUN_SHARE)\\\" ; + +LINKFLAGS on citrun_inst$(SUFEXE) = $(LINKFLAGS) $(INST_LDFLAGS) ; +LINKLIBS on citrun_inst$(SUFEXE) += $(INST_LIBS) ; + +Main citrun_inst : $(INST_SRCS) ; + +if $(NT) { + for i in cl.exe link.exe { + MakeLocate $(i) : $(LOCATE_SOURCE) ; + File $(i) : citrun_inst.exe ; + Clean clean : $(i) ; + } } -actions TestCoverage -{ - set -e - CFLAGS="-coverage" LDFLAGS="-coverage" ./configure - jam -j4 +# Link with the c++ compiler so that the matching c++ runtime library gets added +# automatically. +LINK on citrun_wrap citrun_inst citrun_gl citrun_gltest = $(C++) ; + - # Roll libgcov.a into libcitrun.a. - ar -M < t/libcitrun_gcov.mri +# Create installation directories and setup quirky ../../citrun_inst links. +rule InstallSyms +{ + Depends install : $(PREFIX)/share/citrun/$(>) ; + MakeLocate $(PREFIX)/share/citrun/$(>) : $(<) ; - prove - # prove tt + for i in $(>) + { + SymLink $(PREFIX)/share/citrun/$(i) ; + } +} - gcov -o src src/lib.c - egcov -r src/*.cc +# Used by InstallSyms +actions SymLink +{ + $(RM) $(<) && $(LN) -s ../../bin/citrun_inst $(<) ; } -StaticAnalysis static-analysis ; -TestCoverage test-coverage ; +# +# install +# +InstallLib $(PREFIX)/share/citrun : libcitrun.a ; +InstallShell $(PREFIX)/bin : citrun_check ; +InstallBin $(PREFIX)/bin : citrun_wrap citrun_gl citrun_inst ; +InstallSyms $(PREFIX)/share/citrun : cc gcc clang clang++ g++ c++ egcc eg++ ; + +SubInclude TOP src glyphy ; diff --git a/c++ b/c++ @@ -0,0 +1 @@ +citrun_inst +\ No newline at end of file diff --git a/cc b/cc @@ -0,0 +1 @@ +citrun_inst +\ No newline at end of file diff --git a/src/check.sh b/check.sh diff --git a/src/demo-atlas.cc b/demo-atlas.cc diff --git a/src/demo-atlas.h b/demo-atlas.h diff --git a/src/demo-common.h b/demo-common.h diff --git a/src/demo-glstate.cc b/demo-glstate.cc diff --git a/src/demo-glstate.h b/demo-glstate.h diff --git a/src/demo-shader.cc b/demo-shader.cc diff --git a/src/demo-shader.h b/demo-shader.h diff --git a/src/demo_atlas.glsl b/demo_atlas.glsl diff --git a/src/demo_fshader.glsl b/demo_fshader.glsl diff --git a/src/demo_vshader.glsl b/demo_vshader.glsl diff --git a/src/draw.h b/draw.h diff --git a/eg++ b/eg++ @@ -0,0 +1 @@ +citrun_inst +\ No newline at end of file diff --git a/gcc b/gcc @@ -0,0 +1 @@ +citrun_inst +\ No newline at end of file diff --git a/src/gl_buffer.cc b/gl_buffer.cc diff --git a/src/gl_buffer.h b/gl_buffer.h diff --git a/src/gl_font.cc b/gl_font.cc diff --git a/src/gl_font.h b/gl_font.h diff --git a/src/gl_main.cc b/gl_main.cc diff --git a/src/gl_procfile.cc b/gl_procfile.cc diff --git a/src/gl_procfile.h b/gl_procfile.h diff --git a/src/gl_testmain.cc b/gl_testmain.cc diff --git a/src/gl_transunit.cc b/gl_transunit.cc diff --git a/src/gl_transunit.h b/gl_transunit.h diff --git a/src/gl_view.cc b/gl_view.cc diff --git a/src/gl_view.h b/gl_view.h diff --git a/src/glyphy/Jamfile b/glyphy/Jamfile diff --git a/src/glyphy/glyphy-arc-bezier.hh b/glyphy/glyphy-arc-bezier.hh diff --git a/src/glyphy/glyphy-arc.cc b/glyphy/glyphy-arc.cc diff --git a/src/glyphy/glyphy-arcs-bezier.hh b/glyphy/glyphy-arcs-bezier.hh diff --git a/src/glyphy/glyphy-arcs.cc b/glyphy/glyphy-arcs.cc diff --git a/src/glyphy/glyphy-blob.cc b/glyphy/glyphy-blob.cc diff --git a/src/glyphy/glyphy-common.glsl b/glyphy/glyphy-common.glsl diff --git a/src/glyphy/glyphy-common.hh b/glyphy/glyphy-common.hh diff --git a/src/glyphy/glyphy-extents.cc b/glyphy/glyphy-extents.cc diff --git a/src/glyphy/glyphy-freetype.h b/glyphy/glyphy-freetype.h diff --git a/src/glyphy/glyphy-geometry.hh b/glyphy/glyphy-geometry.hh diff --git a/src/glyphy/glyphy-outline.cc b/glyphy/glyphy-outline.cc diff --git a/src/glyphy/glyphy-sdf.cc b/glyphy/glyphy-sdf.cc diff --git a/src/glyphy/glyphy-sdf.glsl b/glyphy/glyphy-sdf.glsl diff --git a/src/glyphy/glyphy-shaders.cc b/glyphy/glyphy-shaders.cc diff --git a/src/glyphy/glyphy.h b/glyphy/glyphy.h diff --git a/src/inst_action.cc b/inst_action.cc diff --git a/src/inst_action.h b/inst_action.h diff --git a/src/inst_frontend.cc b/inst_frontend.cc diff --git a/src/inst_frontend.h b/inst_frontend.h diff --git a/src/inst_log.h b/inst_log.h diff --git a/src/inst_main.cc b/inst_main.cc diff --git a/src/inst_visitor.cc b/inst_visitor.cc diff --git a/src/inst_visitor.h b/inst_visitor.h diff --git a/src/lib.c b/lib.c diff --git a/src/lib.h b/lib.h diff --git a/src/matrix4x4.c b/matrix4x4.c diff --git a/src/matrix4x4.h b/matrix4x4.h diff --git a/src/process_dir.cc b/process_dir.cc diff --git a/src/process_dir.h b/process_dir.h diff --git a/src/Jamfile b/src/Jamfile @@ -1,117 +0,0 @@ -SubDir TOP src ; - -# -# libcitrun -# -ObjectCcFlags lib.c : -fPIC -ansi ; -Library libcitrun : lib.c ; - -# -# citrun_check -# -MakeLocate citrun_check : $(LOCATE_SOURCE) ; -Shell citrun_check : check.sh ; - -# -# citrun_wrap -# -ObjectDefines wrap.cc : CITRUN_SHARE=\\\"$(CITRUN_SHARE)\\\" ; -Main citrun_wrap : wrap.cc ; - -# -# citrun_term -# -#LINKLIBS on citrun_term += -lcurses ; -#Main citrun_term : term_main.cc ; - -# -# citrun_gl & citrun_gltest -# -GL_SRCS = - gl_procfile.cc - gl_transunit.cc - process_dir.cc - gl_view.cc - demo-atlas.cc - gl_buffer.cc - gl_font.cc - demo-glstate.cc - demo-shader.cc - matrix4x4.c ; - -Library gl_common : $(GL_SRCS) ; - -Stringize demo_atlas_glsl.h : demo_atlas.glsl ; -Stringize demo_vshader_glsl.h : demo_vshader.glsl ; -Stringize demo_fshader_glsl.h : demo_fshader.glsl ; - -ObjectDefines gl_font.cc : FONT_PATH=\\\"$(FONT_PATH)\\\" ; -ObjectC++Flags gl_main.cc gl_testmain.cc $(GL_SRCS) : $(GL_CFLAGS) ; - -LINKLIBS on citrun_gl citrun_gltest += -lm $(GL_LIBS) ; -LinkLibraries citrun_gl citrun_gltest : gl_common libglyphy ; - -Main citrun_gl : gl_main.cc ; - -LINKLIBS on citrun_gltest += $(GLTEST_LIBS) ; -Main citrun_gltest : gl_testmain.cc ; - -# -# citrun_inst -# -INST_SRCS = - inst_main.cc - inst_frontend.cc - inst_action.cc - inst_visitor.cc ; - -Stringize lib_h.h : lib.h ; - -ObjectC++Flags $(INST_SRCS) : $(INST_CFLAGS) ; -ObjectDefines $(INST_SRCS) : CITRUN_SHARE=\\\"$(CITRUN_SHARE)\\\" ; - -LINKFLAGS on citrun_inst$(SUFEXE) = $(LINKFLAGS) $(INST_LDFLAGS) ; -LINKLIBS on citrun_inst$(SUFEXE) += $(INST_LIBS) ; - -Main citrun_inst : $(INST_SRCS) ; - -if $(NT) { - for i in cl.exe link.exe { - MakeLocate $(i) : $(LOCATE_SOURCE) ; - File $(i) : citrun_inst.exe ; - Clean clean : $(i) ; - } -} - -# Link with the c++ compiler so that the matching c++ runtime library gets added -# automatically. -LINK on citrun_wrap citrun_inst citrun_gl citrun_gltest = $(C++) ; - - -# Create installation directories and setup quirky ../../citrun_inst links. -rule InstallSyms -{ - Depends install : $(PREFIX)/share/citrun/$(>) ; - MakeLocate $(PREFIX)/share/citrun/$(>) : $(<) ; - - for i in $(>) - { - SymLink $(PREFIX)/share/citrun/$(i) ; - } -} - -# Used by InstallSyms -actions SymLink -{ - $(RM) $(<) && $(LN) -s ../../bin/citrun_inst $(<) ; -} - -# -# install -# -InstallLib $(PREFIX)/share/citrun : libcitrun.a ; -InstallShell $(PREFIX)/bin : citrun_check ; -InstallBin $(PREFIX)/bin : citrun_wrap citrun_gl citrun_inst ; -InstallSyms $(PREFIX)/share/citrun : cc gcc clang clang++ g++ c++ egcc eg++ ; - -SubInclude TOP src glyphy ; diff --git a/src/c++ b/src/c++ @@ -1 +0,0 @@ -citrun_inst -\ No newline at end of file diff --git a/src/cc b/src/cc @@ -1 +0,0 @@ -citrun_inst -\ No newline at end of file diff --git a/src/eg++ b/src/eg++ @@ -1 +0,0 @@ -citrun_inst -\ No newline at end of file diff --git a/src/gcc b/src/gcc @@ -1 +0,0 @@ -citrun_inst -\ No newline at end of file diff --git a/src/stringize.pl b/stringize.pl diff --git a/src/term_main.cc b/term_main.cc diff --git a/src/wrap.cc b/wrap.cc