packages: doomlegacy/doomlegacy.spec, doomlegacy/svnversion.patch (NEW) - a...

[glen]

Author: glen                         Date: Sun Mar 13 21:24:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add patch to include svn revno in output using exported tarball

---- Files affected:
packages/doomlegacy:
   doomlegacy.spec (1.46 -> 1.47) , svnversion.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/doomlegacy/doomlegacy.spec
diff -u packages/doomlegacy/doomlegacy.spec:1.46 packages/doomlegacy/doomlegacy.spec:1.47
--- packages/doomlegacy/doomlegacy.spec:1.46	Sun Mar 13 22:22:53 2011
+++ packages/doomlegacy/doomlegacy.spec	Sun Mar 13 22:23:55 2011
@@ -95,6 +95,9 @@
 %patch1 -p2
 %patch2 -p1
 %patch3 -p1
+cd -
+%patch4 -p1
+echo %{svnrev} > src/svnrev.txt
 
 %build
 install -d objs bin src/linux_x/{mus,snd}serv/linux
@@ -191,6 +194,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2011/03/13 21:23:55  glen
+- add patch to include svn revno in output using exported tarball
+
 Revision 1.46  2011/03/13 21:22:53  glen
 - up to svn 817, enable x86_64 arch
 

================================================================
Index: packages/doomlegacy/svnversion.patch
diff -u /dev/null packages/doomlegacy/svnversion.patch:1.1
--- /dev/null	Sun Mar 13 22:24:00 2011
+++ packages/doomlegacy/svnversion.patch	Sun Mar 13 22:23:55 2011
@@ -0,0 +1,67 @@
+--- doomlegacy-1.44/src/Makefile	2011-03-13 23:16:45.655640054 +0200
++++ doomlegacy-1.44/src/Makefile	2011-03-13 23:14:40.039898572 +0200
+@@ -41,11 +41,6 @@
+ # SDL Mixer, to get music
+ HAVE_MIXER=1
+ 
+-# Developers with svn can enable this to have svn number in executable.
+-# Causes compile error message otherwise.
+-# Until can find test for presence of svn, this is best that can be done.
+-#SVN_ENABLE=1
+-
+ # Subdirectories for objects and binaries
+ O=../objs
+ BIN=../bin
+@@ -92,7 +87,6 @@
+ NASMFORMAT=elf -DLINUX
+ i_cdmus_o=$(O)/i_cdmus.o
+ 
+-
+ # default system media interface
+ ifndef SMIF
+   SMIF = SDL
+@@ -331,6 +325,7 @@
+ OBJS :=  $(OBJS) \
+ 		$(O)/dstrings.o  \
+ 		$(i_cdmus_o)	 \
++		$(O)/i_main.o	 \
+ 		$(O)/i_net.o	 \
+ 		$(O)/i_tcp.o	 \
+ 		$(O)/i_system.o  \
+@@ -462,15 +457,13 @@
+ $(O):
+ 	@mkdir $(O)
+ 
+-.PHONY : versionstring
+-# This may fail because, (a) svn not installed, (b) not a svn directory.
+-# This compiles d_main a second time, with SVN_REV set.
+-versionstring:
+-ifdef SVN_ENABLE
+-	$(CC) -c $(CFLAGS) -DSVN_REV=\"`svn info | grep Revision | sed -e 's/Revision: //'`\" d_main.c -o $(O)/d_main.o
+-endif
+-
++# this prints "exported" if is outside svn dir, and "none" if svn not installed
++# release tarball should include svnrev.txt or not use the define in code.
++svnrev.txt:
++	(svnversion 2>/dev/null || echo none) > $@
+ 
++$(O)/d_main.o: d_main.c svnrev.txt
++	$(CC) $(CFLAGS) -DSVN_REV=\"`cat svnrev.txt`\" -c $< -o $@
+ 
+ $(BIN)/wadtool: $(O)/wadtool.o $(O)/md5_cpp.o
+ 	$(CXX) $(LDFLAGS) $^ -o $@
+@@ -503,12 +496,11 @@
+ asm: $(BIN)/$(EXENAME)
+ 	objdump -d $(BIN)/$(EXENAME) --no-show-raw-insn > $(BIN)/doomlegacy.s
+ 
+-
+ # executable
+-$(BIN)/$(EXENAME): $(O) $(OBJS) $(O)/i_main.o versionstring
++$(BIN)/$(EXENAME): $(O) $(OBJS)
+ #	 @mkdir $(BIN)
+ 	@echo Linking...
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(O)/i_main.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) \
+ 	-o $(BIN)/$(EXENAME) $(LIBS)
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomlegacy/doomlegacy.spec?r1=1.46&r2=1.47&f=u