From 1d8aef3dc44cb4e793a3c69426cd726e0ba622db Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 16 Dec 2015 15:48:07 +0200 Subject: Replace build.sh with odb.sh --- brep/odb.sh | 11 ++++++++++ build.sh | 69 ------------------------------------------------------------- 2 files changed, 11 insertions(+), 69 deletions(-) create mode 100755 brep/odb.sh delete mode 100755 build.sh diff --git a/brep/odb.sh b/brep/odb.sh new file mode 100755 index 0000000..489d423 --- /dev/null +++ b/brep/odb.sh @@ -0,0 +1,11 @@ +#! /usr/bin/env bash + +odb -d pgsql --std c++11 --generate-query --generate-schema \ + --odb-epilogue '#include ' \ + --hxx-prologue '#include ' \ + --hxx-prologue "#include " \ + --sql-epilogue-file package-extra.sql \ + -I .. -I ../../libbpkg -I ../../libbutl \ + --hxx-suffix "" --include-with-brackets \ + --include-prefix brep --guard-prefix BREP \ + package diff --git a/build.sh b/build.sh deleted file mode 100755 index 5772f85..0000000 --- a/build.sh +++ /dev/null @@ -1,69 +0,0 @@ -DEBUG="-g -ggdb -fno-inline" - -cd ./brep - -echo "odb package" - -odb -d pgsql --std c++11 --generate-query --generate-schema \ - --odb-epilogue '#include ' \ - --hxx-prologue '#include ' \ - --hxx-prologue "#include " \ - --sql-epilogue-file package-extra.sql \ - -I .. -I ../../libbpkg -I ../../libbutl \ - --hxx-suffix "" --include-with-brackets \ - --include-prefix brep --guard-prefix BREP \ - package -e=$? -if test $e -ne 0; then exit $e; fi - -echo "g++ libbrep.so" - -s="package.cxx package-traits.cxx package-odb.cxx" - -g++ -shared $DEBUG -std=c++11 -I.. -I../../libbpkg \ - -I../../libbutl -L../../libbpkg/bpkg -L../../libbutl/butl \ - -fPIC -o libbrep.so $s -lbpkg -lbutl -lodb-pgsql -lodb - -echo "cli mod_brep options" - -cli --include-with-brackets --include-prefix brep --hxx-suffix "" \ - --guard-prefix BREP --cxx-prologue "#include " \ - --cli-namespace brep::cli --generate-file-scanner --suppress-usage \ - --generate-modifier --generate-description --option-prefix "" ./options.cli - -echo "g++ libmod_brep.so" - -s="options.cxx services.cxx package-search.cxx package-details.cxx \ -package-version-details.cxx repository-details.cxx repository-root.cxx \ -module.cxx page.cxx shared-database.cxx diagnostics.cxx \ -../web/apache/request.cxx ../web/apache/service.cxx \ -../web/mime-url-encoding.cxx" - -g++ -shared $DEBUG -std=c++11 -I/usr/include/apr-1 -I/usr/include/httpd \ - -I.. -I../../libbpkg -I../../libbutl -L. -L../../libbpkg/bpkg \ - -fPIC -o libmod_brep.so $s -lbrep -lbpkg -lodb-pgsql -lodb -lstudxml - -cd ../loader - -echo "cli loader options" - -cli --hxx-suffix "" --cli-namespace brep::cli ./options.cli - -echo "g++ brep-loader" - -s="loader.cxx options.cxx" - -g++ $DEBUG -std=c++11 -I.. -I../../libbpkg \ - -I../../libbutl -L../brep -L../../libbpkg/bpkg -L../../libbutl/butl \ - -o brep-loader $s -lbrep -lbpkg -lbutl -lodb-pgsql -lodb - -cd ../tests/loader - -echo "g++ tests/loader" - -s="driver.cxx" - -g++ $DEBUG -std=c++11 -I../.. -I../../../libbpkg \ - -I../../../libbutl -L../../brep -L../../../libbpkg/bpkg \ - -L../../../libbutl/butl \ - -o driver $s -lbrep -lbpkg -lbutl -lodb-pgsql -lodb -- cgit v1.1