r3904 - in packages/trunk/bulletml/debian: . patches

Miriam Ruiz baby-guest at alioth.debian.org
Tue Aug 28 11:39:17 UTC 2007 

Author: baby-guest
Date: 2007-08-28 11:39:17 +0000 (Tue, 28 Aug 2007)
New Revision: 3904

Added:
   packages/trunk/bulletml/debian/libbulletml0d1.install
Removed:
   packages/trunk/bulletml/debian/libbulletml0.install
   packages/trunk/bulletml/debian/shlibs.local.ex
Modified:
   packages/trunk/bulletml/debian/control
   packages/trunk/bulletml/debian/libbulletml-dev.install
   packages/trunk/bulletml/debian/patches/fixes.patch
   packages/trunk/bulletml/debian/rules
Log:
Build shared library properly



Modified: packages/trunk/bulletml/debian/control
===================================================================
--- packages/trunk/bulletml/debian/control	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/control	2007-08-28 11:39:17 UTC (rev 3904)
@@ -8,7 +8,7 @@
 Package: libbulletml-dev
 Section: libdevel
 Architecture: any
-Depends: libbulletml0 (= ${binary:Version})
+Depends: libbulletml0d1 (= ${binary:Version})
 Description: C++ library to handle BulletML easily - development files
  BulletML is the Bullet Markup Language. BulletML can describe the barrage of
  bullets in shooting games.
@@ -18,7 +18,7 @@
  .
   Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html
 
-Package: libbulletml0
+Package: libbulletml0d1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -27,8 +27,10 @@
  bullets in shooting games.
  .
  There are many advantages for using BulletML:
- * BulletML can describe the complicated barrage of bullets in recent shooting games easily.
- * BulletML demo applet is available. Write BulletML document, and check it on this applet.
- * BulletML is XML-based language. It offers data portability and reusability. 
+ * BulletML can describe the complicated barrage of bullets in recent shooting
+   games easily.
+ * BulletML demo applet is available. Write BulletML document, and check it on
+   this applet.
+ * BulletML is XML-based language. It offers data portability and reusability.
  .
   Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html

Modified: packages/trunk/bulletml/debian/libbulletml-dev.install
===================================================================
--- packages/trunk/bulletml/debian/libbulletml-dev.install	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/libbulletml-dev.install	2007-08-28 11:39:17 UTC (rev 3904)
@@ -1,4 +1,4 @@
-#usr/include/* usr/include/
+src/bulletml.d usr/include/d/
 src/lib*.a usr/lib/
 src/lib*.so usr/lib/
 #src/*.la usr/lib/

Deleted: packages/trunk/bulletml/debian/libbulletml0.install
===================================================================
--- packages/trunk/bulletml/debian/libbulletml0.install	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/libbulletml0.install	2007-08-28 11:39:17 UTC (rev 3904)
@@ -1 +0,0 @@
-src/lib*.so.* usr/lib/

Copied: packages/trunk/bulletml/debian/libbulletml0d1.install (from rev 3898, packages/trunk/bulletml/debian/libbulletml0.install)
===================================================================
--- packages/trunk/bulletml/debian/libbulletml0d1.install	                        (rev 0)
+++ packages/trunk/bulletml/debian/libbulletml0d1.install	2007-08-28 11:39:17 UTC (rev 3904)
@@ -0,0 +1 @@
+src/lib*.so.* usr/lib/

Modified: packages/trunk/bulletml/debian/patches/fixes.patch
===================================================================
--- packages/trunk/bulletml/debian/patches/fixes.patch	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/patches/fixes.patch	2007-08-28 11:39:17 UTC (rev 3904)
@@ -1,7 +1,7 @@
 Index: bulletml-0.0.6/src/bulletmlparser.h
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser.h	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser.h	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser.h	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser.h	2007-08-28 11:37:23.000000000 +0000
 @@ -70,11 +70,10 @@
      bool isHorizontal_;
  
@@ -19,8 +19,8 @@
  
 Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.cpp	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.cpp	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-tinyxml.cpp	2007-08-28 11:37:23.000000000 +0000
 @@ -5,8 +5,8 @@
  
  #include <string>
@@ -43,8 +43,8 @@
  }
 Index: bulletml-0.0.6/src/bulletmlparser-tinyxml.h
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.h	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-tinyxml.h	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-tinyxml.h	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-tinyxml.h	2007-08-28 11:37:23.000000000 +0000
 @@ -16,12 +16,12 @@
  
  class BulletMLParserTinyXML : public BulletMLParser {
@@ -70,8 +70,8 @@
  
 Index: bulletml-0.0.6/src/bulletmlparser-xerces.cpp
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.cpp	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-xerces.cpp	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-xerces.cpp	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-xerces.cpp	2007-08-28 11:37:23.000000000 +0000
 @@ -19,9 +19,9 @@
  	BulletMLParserXercesSAXHandler(BulletMLParserXerces* parser);
  
@@ -105,8 +105,8 @@
  	}
 Index: bulletml-0.0.6/src/bulletmlparser-xerces.h
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-xerces.h	2007-08-28 09:43:44.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-xerces.h	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-xerces.h	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-xerces.h	2007-08-28 11:37:23.000000000 +0000
 @@ -8,18 +8,14 @@
  
  #ifdef USE_XERCES
@@ -129,8 +129,8 @@
  
 Index: bulletml-0.0.6/src/bulletmlparser-ygg.cpp
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-ygg.cpp	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-ygg.cpp	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-ygg.cpp	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-ygg.cpp	2007-08-28 11:37:23.000000000 +0000
 @@ -63,8 +63,8 @@
  	curNode_->setValue(trimString(text.get_text()));
  }
@@ -154,8 +154,8 @@
  std::string BulletMLParserYggdrasil::trimString(const std::string& str) {
 Index: bulletml-0.0.6/src/bulletmlparser-ygg.h
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlparser-ygg.h	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlparser-ygg.h	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlparser-ygg.h	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlparser-ygg.h	2007-08-28 11:37:23.000000000 +0000
 @@ -24,7 +24,7 @@
  	void catch_text(yggdrasil::ygg_node text);
  
@@ -175,8 +175,8 @@
  
 Index: bulletml-0.0.6/src/bulletmlrunnerimpl.cpp
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.cpp	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlrunnerimpl.cpp	2007-08-28 11:37:23.000000000 +0000
 @@ -25,8 +25,7 @@
  	&BulletMLRunnerImpl::runVanish
  };
@@ -221,8 +221,8 @@
  	calcChangeDirection(dir, term, type == BulletMLNode::sequence);
 Index: bulletml-0.0.6/src/bulletmlrunnerimpl.h
 ===================================================================
---- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.h	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/bulletmlrunnerimpl.h	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/bulletmlrunnerimpl.h	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/bulletmlrunnerimpl.h	2007-08-28 11:37:23.000000000 +0000
 @@ -136,7 +136,7 @@
      double getNumberContents(const BulletMLNode* node);
      std::vector<double>* getParameters();
@@ -234,8 +234,8 @@
  private:
 Index: bulletml-0.0.6/src/calc.cpp
 ===================================================================
---- bulletml-0.0.6.orig/src/calc.cpp	2007-08-28 09:43:43.000000000 +0000
-+++ bulletml-0.0.6/src/calc.cpp	2007-08-28 09:43:45.000000000 +0000
+--- bulletml-0.0.6.orig/src/calc.cpp	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/calc.cpp	2007-08-28 11:37:23.000000000 +0000
 @@ -1017,9 +1017,9 @@
  
  
@@ -286,36 +286,43 @@
  
 Index: bulletml-0.0.6/src/Makefile
 ===================================================================
---- bulletml-0.0.6.orig/src/Makefile	2007-08-28 09:43:44.000000000 +0000
-+++ bulletml-0.0.6/src/Makefile	2007-08-28 09:44:09.000000000 +0000
-@@ -1,27 +1,38 @@
+--- bulletml-0.0.6.orig/src/Makefile	2007-08-28 11:37:20.000000000 +0000
++++ bulletml-0.0.6/src/Makefile	2007-08-28 11:37:52.000000000 +0000
+@@ -1,27 +1,46 @@
 -CC = g++
 -INCLUDES = -I.
 -LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o
  #CXXFLAGS = -g -W -Wall -ansi -pedantic
  #CXXFLAGS = -pg -g -W -Wall -ansi -pedantic
--CXXFLAGS = -O2 -W -Wall -ansi -pedantic
-+CXXFLAGS = -O2 -W -Wall -ansi -pedantic -I. -I../d_cpp
++#CXXFLAGS = -O2 -W -Wall -ansi -pedantic -I. -I../d_cpp
+ CXXFLAGS = -O2 -W -Wall -ansi -pedantic
  CFLAGS = -O2
 -OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
++LDFLAGS=
++INCLUDES= -I. -I../d_cpp
 +OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o \
 +	formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o bulletml_d.o
- 
--all: libbulletml.a
++
 +MAJOR=0d1
 +MINOR=0
- 
--libbulletml.a: $(OBJS)
++
 +all: libbulletml_d.a libbulletml_d.so
 +
 +libbulletml_d.so: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
-+	gcc -shared -Wl,-soname,libfoo.so.$(MAJOR) -o libbulletml_d.so.$(MAJOR).$(MINOR) *.o tinyxml/tiny*.o
++	$(CXX) $(LDFLAGS) -shared \
++		-Wl,-soname,libfoo.so.$(MAJOR) \
++		-o libbulletml_d.so.$(MAJOR).$(MINOR) \
++		*.o tinyxml/tiny*.o
++	rm -f libbulletml_d.so.$(MAJOR)
 +	ln -s libbulletml_d.so.$(MAJOR).$(MINOR) libbulletml_d.so.$(MAJOR)
++	rm -f libbulletml_d.so
 +	ln -s libbulletml_d.so.$(MAJOR) libbulletml_d.so
-+
+ 
+-all: libbulletml.a
 +libbulletml_d.a: tinyxml/tinyxml.o ../bulletml.d $(OBJS)
 +	ar cru libbulletml_d.a *.o tinyxml/tiny*.o
-+
+ 
+-libbulletml.a: $(OBJS)
 +../bulletml.d: bulletml_d.cpp
 +	perl ../d_cpp/create_d_import.pl bulletml_d.cpp bulletml.d
 +

Modified: packages/trunk/bulletml/debian/rules
===================================================================
--- packages/trunk/bulletml/debian/rules	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/rules	2007-08-28 11:39:17 UTC (rev 3904)
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -Wall -ansi -pedantic
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -29,14 +29,19 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(MAKE) -C src
+	rm -f src/*.o src/*/*.o
+	$(MAKE) -C src CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" libbulletml_d.a
+	rm -f src/*.o src/*/*.o
+	$(MAKE) -C src CFLAGS="$(CFLAGS) -fPIC -fpic" CXXFLAGS="$(CFLAGS) -fPIC -fpic" \
+		LDFLAGS="-Wl,-z,defs" libbulletml_d.so
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -C src clean
+	$(MAKE) -C src clean
+	rm -f src/*.so src/*.so.* src/*.o
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
@@ -45,7 +50,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	#$(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-independent files here.
 binary-indep: build install

Deleted: packages/trunk/bulletml/debian/shlibs.local.ex
===================================================================
--- packages/trunk/bulletml/debian/shlibs.local.ex	2007-08-28 11:30:53 UTC (rev 3903)
+++ packages/trunk/bulletml/debian/shlibs.local.ex	2007-08-28 11:39:17 UTC (rev 3904)
@@ -1 +0,0 @@
-libbulletml 0.0.6 bulletml (>> 0.0.6-0), bulletml (<< 0.0.6-99)

More information about the Pkg-games-commits mailing list