nrtb-core team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 38
committer: fpstovall@xxxxxxxxx
branch nick: dev
timestamp: Thu 2011-07-21 22:58:56 -0400
message:
  Revamped the C++ Google Protocol Buffers *.proto build process so that it's now completely contained in the common libs make process. This allows the storage area for .proto files to stay simple and and easy for other languages to use.
  
  No further modifications to the GPB build for C++ should be needed for new proto files. All .proto files stored in GPB_proto are automatically picked up and included in the build.
removed:
  GPB_proto/Makefile
  GPB_proto/cpp_src/
  GPB_proto/include/
  GPB_proto/lib/
  GPB_proto/obj/
  GPB_proto/proto/
added:
  common/GPB/
  common/GPB/Makefile
  common/GPB/cpp_src/
  common/GPB/obj/
renamed:
  GPB_proto/proto/ack_nak.proto => GPB_proto/ack_nak.proto
  GPB_proto/proto/physics_common.proto => GPB_proto/physics_common.proto
  GPB_proto/proto/sim_obj_tq_update.proto => GPB_proto/sim_obj_tq_update.proto
  GPB_proto/proto/sim_to_db_wrapper.proto => GPB_proto/sim_to_db_wrapper.proto
modified:
  common/Makefile


--
lp:~fpstovall/nrtb/cpp_common
https://code.launchpad.net/~fpstovall/nrtb/cpp_common

Your team NRTB Core is subscribed to branch lp:~fpstovall/nrtb/cpp_common.
To unsubscribe from this branch go to https://code.launchpad.net/~fpstovall/nrtb/cpp_common/+edit-subscription

=== removed file 'GPB_proto/Makefile'
--- GPB_proto/Makefile	2011-07-22 02:03:54 +0000
+++ GPB_proto/Makefile	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#***********************************************
-#This file is part of the NRTB project (https://launchpad.net/nrtb).
-#
-#    NRTB is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    NRTB is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with NRTB.  If not, see <http://www.gnu.org/licenses/>.
-#
-#***********************************************
-
-lib/nrtb_gpb.a:
-	@protoc -I=proto/ --cpp_out=cpp_src/ proto/*.proto
-	@cd obj; for file in ../cpp_src/*.cc; do g++ -c $$file; done
-	@cp -v cpp_src/*h include
-	@ar -r lib/nrtb_gpb.a obj/*.o
-	@echo "GPB lib build complete."
-
-clean:
-	@rm -vf lib/* obj/* cpp_src/* include/*
-	@echo "GPB cleanup complete."

=== renamed file 'GPB_proto/proto/ack_nak.proto' => 'GPB_proto/ack_nak.proto'
=== removed directory 'GPB_proto/cpp_src'
=== removed directory 'GPB_proto/include'
=== removed directory 'GPB_proto/lib'
=== removed directory 'GPB_proto/obj'
=== renamed file 'GPB_proto/proto/physics_common.proto' => 'GPB_proto/physics_common.proto'
=== removed directory 'GPB_proto/proto'
=== renamed file 'GPB_proto/proto/sim_obj_tq_update.proto' => 'GPB_proto/sim_obj_tq_update.proto'
=== renamed file 'GPB_proto/proto/sim_to_db_wrapper.proto' => 'GPB_proto/sim_to_db_wrapper.proto'
=== added directory 'common/GPB'
=== added file 'common/GPB/Makefile'
--- common/GPB/Makefile	1970-01-01 00:00:00 +0000
+++ common/GPB/Makefile	2011-07-22 02:58:56 +0000
@@ -0,0 +1,34 @@
+#***********************************************
+#This file is part of the NRTB project (https://launchpad.net/nrtb).
+#
+#    NRTB is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    NRTB is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with NRTB.  If not, see <http://www.gnu.org/licenses/>.
+#
+#***********************************************
+
+proto=../../GPB_proto
+
+lib:	lib/nrtb_gpb.a
+	@echo "GPB lib build complete."
+
+lib/nrtb_gpb.a:
+	@protoc -I=${proto} --cpp_out=cpp_src/ ${proto}/*.proto
+	@cd obj; for file in ../cpp_src/*.cc; do g++ -c $$file; done
+	@cp -v cpp_src/*h ../include
+	@ar -r ../lib/nrtb_gpb.a obj/*.o
+
+clean:
+	@cd cpp_src; for file in *h; do rm -vf ../../include/$$file; done
+	@rm -vf ../lib/nrtb_gpb.a
+	@rm -f obj/* cpp_src/*
+	@echo "GPB cleanup complete."

=== added directory 'common/GPB/cpp_src'
=== added directory 'common/GPB/obj'
=== modified file 'common/Makefile'
--- common/Makefile	2011-02-23 02:08:30 +0000
+++ common/Makefile	2011-07-22 02:58:56 +0000
@@ -42,3 +42,4 @@
 	@cd timer; make ${action}
 	@cd logger; make ${action}
 	@cd confreader; make ${action}
+	@cd GPB; make ${action}