Thread: [Toss-devel-svn] SF.net SVN: toss:[1247] trunk/Toss/Makefile
Status: Beta
Brought to you by:
lukaszkaiser
From: <luk...@us...> - 2010-12-12 00:02:00
|
Revision: 1247 http://toss.svn.sourceforge.net/toss/?rev=1247&view=rev Author: lukaszkaiser Date: 2010-12-12 00:01:54 +0000 (Sun, 12 Dec 2010) Log Message: ----------- Correct release script. Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2010-12-12 00:01:22 UTC (rev 1246) +++ trunk/Toss/Makefile 2010-12-12 00:01:54 UTC (rev 1247) @@ -6,17 +6,19 @@ Server: Play/Server.native cp _build/Play/Server.native Server -Release: - make -C . clean - make -C . Client - make -C . Server - make -C . doc - mkdir ../toss_0.5 - cp -r * ../toss_0.5 - find ../toss_0.5 -name '.svn' -exec rm -rf {} \; - rm -rf ../toss_0.5/_build ../toss_0.5/gmon.out - zip -r toss_0.5.zip ../toss_0.5 - rm -rf ../toss_0.5 +RELEASE=0.5 +Release: Client Server doc + rm -f *~ Formula/*~ Solver/*~ Arena/*~ Play/*~ Client/*~ www/*~ + make -C www + mkdir ../toss_$(RELEASE) + cp -r * ../toss_$(RELEASE) + mv ../toss_$(RELEASE) . + - find toss_$(RELEASE) -name '.svn' -exec rm -rf {} \; + rm -rf toss_$(RELEASE)/Toss.docdir + mv toss_$(RELEASE)/_build/Toss.docdir toss_$(RELEASE)/doc + rm -rf toss_$(RELEASE)/_build toss_$(RELEASE)/gmon.out + zip -r toss_$(RELEASE).zip toss_$(RELEASE) + rm -rf toss_$(RELEASE) # ------ NON OCAMLBUILD DEPENDENCIES -------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2011-10-07 17:34:20
|
Revision: 1585 http://toss.svn.sourceforge.net/toss/?rev=1585&view=rev Author: simles Date: 2011-10-07 17:34:14 +0000 (Fri, 07 Oct 2011) Log Message: ----------- Added OS X Lion path for Macports to Makefile Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2011-10-07 17:01:31 UTC (rev 1584) +++ trunk/Toss/Makefile 2011-10-07 17:34:14 UTC (rev 1585) @@ -36,9 +36,9 @@ # -------- MAIN OCAMLBUILD PART -------- -OCB_LFLAG=-lflags -I,+oUnit,-I,+sqlite3 -OCB_LFLAGBT=-lflags -I,+oUnit,-I,+sqlite3 -OCB_CFLAG=-cflags -I,+oUnit,-I,+sqlite3,-g +OCB_LFLAG=-lflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3 +OCB_LFLAGBT=-lflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3 +OCB_CFLAG=-cflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3,-g OCB_LIB=-libs str,nums,unix,oUnit,sqlite3 OCB_PP=-pp "camlp4o ../caml_extensions/pa_let_try.cmo ../caml_extensions/pa_backtrace.cmo" OCAMLBUILD=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf $(OCB_PP) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luk...@us...> - 2012-01-16 01:49:48
|
Revision: 1639 http://toss.svn.sourceforge.net/toss/?rev=1639&view=rev Author: lukaszkaiser Date: 2012-01-16 01:49:42 +0000 (Mon, 16 Jan 2012) Log Message: ----------- Byte compilation corrections. Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2012-01-06 00:34:49 UTC (rev 1638) +++ trunk/Toss/Makefile 2012-01-16 01:49:42 UTC (rev 1639) @@ -33,14 +33,11 @@ # -------- MAIN OCAMLBUILD PART -------- OCB_LFLAG=-lflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3 -OCB_LFLAGBT=-lflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3 OCB_CFLAG=-cflags -I,+oUnit,-I,+sqlite3,-I,+site-lib/oUnit,-I,+site-lib/sqlite3,-g OCB_LIB=-libs str,nums,unix,oUnit,sqlite3 OCB_PP=-pp "camlp4o ../caml_extensions/pa_let_try.cmo" OCAMLBUILD=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf $(OCB_PP) \ $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG) -OCAMLBUILDBT=ocamlbuild -log build.log -j 8 menhir ../menhir_conf $(OCB_PP) \ - $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAGBT) OCAMLBUILDNOPP=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf \ $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG) @@ -59,8 +56,11 @@ %.p.native: %.ml caml_extensions/pa_let_try.cmo $(OCAMLBUILD) -Is $($(subst /,INC,$(dir $@))) $@ +%.byte: %.ml caml_extensions/pa_let_try.cmo + $(OCAMLBUILD) -Is $($(subst /,INC,$(dir $@))) $@ + %.d.byte: %.ml caml_extensions/pa_let_try.cmo - $(OCAMLBUILDBT) -Is $($(subst /,INC,$(dir $@))) $@ + $(OCAMLBUILD) -Is $($(subst /,INC,$(dir $@))) $@ doc: caml_extensions/pa_let_try.cmo $(OCAMLBUILDNOPP) -Is +oUnit,+sqlite3,$(.INC) Toss.docdir/index.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luk...@us...> - 2012-02-07 20:07:24
|
Revision: 1670 http://toss.svn.sourceforge.net/toss/?rev=1670&view=rev Author: lukaszkaiser Date: 2012-02-07 20:07:13 +0000 (Tue, 07 Feb 2012) Log Message: ----------- Compilation corrections for OSX. Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2012-02-07 02:10:47 UTC (rev 1669) +++ trunk/Toss/Makefile 2012-02-07 20:07:13 UTC (rev 1670) @@ -41,12 +41,12 @@ # -------- MAIN OCAMLBUILD PART -------- # TODO: Hard-coded path to js_of_ocaml. -OCB_LFLAG=-lflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+oUnit,-I,+js_of_ocaml,-I,+site-lib/oUnit -OCB_CFLAG=-cflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+oUnit,-I,+js_of_ocaml,-I,+site-lib/oUnit,-g +OCB_LFLAG=-lflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+oUnit,-I,+js_of_ocaml,-I,+site-lib/oUnit,-I,+site-lib/js_of_ocaml +OCB_CFLAG=-cflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+oUnit,-I,+js_of_ocaml,-I,+site-lib/oUnit,-I,+site-lib/js_of_ocaml,-g OCB_LIB=-libs str,nums,unix,oUnit OCB_LIBJS=-libs str,js_of_ocaml -OCB_PP=-pp "camlp4o -I /usr/local/lib/ocaml/3.12.0 ../caml_extensions/pa_let_try.cmo pa_macro.cmo js_of_ocaml/pa_js.cmo" -OCB_PPJS=-pp "camlp4o -unsafe -I /usr/local/lib/ocaml/3.12.0 ../caml_extensions/pa_let_try.cmo pa_macro.cmo -DJAVASCRIPT js_of_ocaml/pa_js.cmo" +OCB_PP=-pp "camlp4o -I /usr/local/lib/ocaml/3.12.0 -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo pa_macro.cmo js_of_ocaml/pa_js.cmo" +OCB_PPJS=-pp "camlp4o -unsafe -I /usr/local/lib/ocaml/3.12.0 -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo pa_macro.cmo -DJAVASCRIPT js_of_ocaml/pa_js.cmo" OCAMLBUILD=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf \ -ocamlopt "ocamlopt -inline 10" $(OCB_PP) \ $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luk...@us...> - 2012-05-12 20:20:14
|
Revision: 1706 http://toss.svn.sourceforge.net/toss/?rev=1706&view=rev Author: lukstafi Date: 2012-05-12 20:20:08 +0000 (Sat, 12 May 2012) Log Message: ----------- Minor change: removing hard-coded paths (works after properly installing js-of-ocaml). Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2012-05-11 22:17:01 UTC (rev 1705) +++ trunk/Toss/Makefile 2012-05-12 20:20:08 UTC (rev 1706) @@ -101,12 +101,12 @@ # -------- MAIN OCAMLBUILD PART -------- # TODO: Hard-coded path to js_of_ocaml. -OCB_LFLAG=-lflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g -OCB_CFLAG=-cflags -I,/usr/local/lib/ocaml/3.12.0/js_of_ocaml,-I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g +OCB_LFLAG=-lflags -I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g +OCB_CFLAG=-cflags -I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g OCB_LIB=-libs unix OCB_LIBJS=-libs js_of_ocaml -OCB_PP=-pp "camlp4o -I /usr/local/lib/ocaml/3.12.0 -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo ../caml_extensions/pa_log.cmo pa_macro.cmo js_of_ocaml/pa_js.cmo" -OCB_PPJS=-pp "camlp4o -unsafe -I /usr/local/lib/ocaml/3.12.0 -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo ../caml_extensions/pa_log.cmo pa_macro.cmo -DJAVASCRIPT js_of_ocaml/pa_js.cmo" +OCB_PP=-pp "camlp4o -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo ../caml_extensions/pa_log.cmo pa_macro.cmo js_of_ocaml/pa_js.cmo" +OCB_PPJS=-pp "camlp4o -unsafe -I /opt/local/lib/ocaml/site-lib ../caml_extensions/pa_let_try.cmo ../caml_extensions/pa_log.cmo pa_macro.cmo -DJAVASCRIPT js_of_ocaml/pa_js.cmo" OCAMLBUILD=ocamlbuild -log build.log -j 8 -menhir ../menhir_conf \ -ocamlopt "ocamlopt -inline 10" $(OCB_PP) \ $(OCB_LIB) $(OCB_CFLAG) $(OCB_LFLAG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luk...@us...> - 2012-05-12 20:29:43
|
Revision: 1707 http://toss.svn.sourceforge.net/toss/?rev=1707&view=rev Author: lukstafi Date: 2012-05-12 20:29:37 +0000 (Sat, 12 May 2012) Log Message: ----------- Minor comment fix to last commit. Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2012-05-12 20:20:08 UTC (rev 1706) +++ trunk/Toss/Makefile 2012-05-12 20:29:37 UTC (rev 1707) @@ -100,7 +100,6 @@ # -------- MAIN OCAMLBUILD PART -------- -# TODO: Hard-coded path to js_of_ocaml. OCB_LFLAG=-lflags -I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g OCB_CFLAG=-cflags -I,+js_of_ocaml,-I,+site-lib/js_of_ocaml,-g OCB_LIB=-libs unix This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luk...@us...> - 2012-06-22 13:58:22
|
Revision: 1732 http://toss.svn.sourceforge.net/toss/?rev=1732&view=rev Author: lukaszkaiser Date: 2012-06-22 13:58:16 +0000 (Fri, 22 Jun 2012) Log Message: ----------- Correcting a build bug I introduced with DrawingTest. Modified Paths: -------------- trunk/Toss/Makefile Modified: trunk/Toss/Makefile =================================================================== --- trunk/Toss/Makefile 2012-06-22 13:48:24 UTC (rev 1731) +++ trunk/Toss/Makefile 2012-06-22 13:58:16 UTC (rev 1732) @@ -110,7 +110,7 @@ EXTDEPS = caml_extensions/pa_let_try.cmo caml_extensions/pa_log.cmo Formula/Resources.ml -MKPARSED = ./TRSTest.native -v -l "Term/lib" +MKPARSED = ./TRSTest.native -l "Term/lib" %.trs.parsed: %.trs make ./Term/TRSTest.native @@ -145,7 +145,7 @@ LearnINC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena GGPINC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena,Play ServerINC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena,Play,GGP,Learn,Client -ClientINC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena,Play,GGP,Learn,Server +ClientINC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena,Play,GGP,Learn,Server,Client .INC=MenhirLib,Term,Formula,Formula/Sat,Formula/Sat/dpll,Solver/RealQuantElim,Solver/Num,Solver,Arena,Play,GGP,Learn,Server This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |