From: <baz...@us...> - 2009-01-12 09:02:25
|
Revision: 8797 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8797&view=rev Author: bazaarmagetron Date: 2009-01-12 09:02:12 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Manuel Moos: Fixed warnings by find. Modified Paths: -------------- armagetronad/branches/0.2.8/build/scripts/winsrc Property Changed: ---------------- armagetronad/branches/0.2.8/build/ Property changes on: armagetronad/branches/0.2.8/build ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-02-16 11:24:25.201999903 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: release + timestamp: 2009-01-12 09:57:00.637000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: release Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 26 z-...@us...-20080216101723-0t6yzvx546p1uzpr 27 z-...@us...-20080216102425-z38kmgyr6jh8mnvs + 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 26 z-...@us...-20080216101723-0t6yzvx546p1uzpr 27 z-...@us...-20080216102425-z38kmgyr6jh8mnvs 28 z-...@us...-20090112085700-q49z8atyrf1n259o Modified: armagetronad/branches/0.2.8/build/scripts/winsrc =================================================================== --- armagetronad/branches/0.2.8/build/scripts/winsrc 2009-01-11 23:46:36 UTC (rev 8796) +++ armagetronad/branches/0.2.8/build/scripts/winsrc 2009-01-12 09:02:12 UTC (rev 8797) @@ -76,5 +76,5 @@ find $WINDIR -name "*.am" -exec rm \{\} \; find $WINDIR -name "Makefile*" -exec rm \{\} \; find $WINDIR -name "*.ghost" -exec rm \{\} \; -find $WINDIR -name "CVS" -depth -exec rm -rf \{\} \; -find $WINDIR -name "*~" -depth -exec rm -rf \{\} \; +find $WINDIR -depth -name "CVS" -exec rm -rf \{\} \; +find $WINDIR -depth -name "*~" -exec rm -rf \{\} \; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 09:08:27
|
Revision: 8798 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8798&view=rev Author: bazaarmagetron Date: 2009-01-12 09:08:23 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Manuel Moos: Fixed configure path. Modified Paths: -------------- armagetronad/branches/0.2.8/build/scripts/configure Property Changed: ---------------- armagetronad/branches/0.2.8/build/ Property changes on: armagetronad/branches/0.2.8/build ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 09:57:00.637000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: release + timestamp: 2009-01-12 10:03:52.043999910 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: release Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 26 z-...@us...-20080216101723-0t6yzvx546p1uzpr 27 z-...@us...-20080216102425-z38kmgyr6jh8mnvs 28 z-...@us...-20090112085700-q49z8atyrf1n259o + 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 26 z-...@us...-20080216101723-0t6yzvx546p1uzpr 27 z-...@us...-20080216102425-z38kmgyr6jh8mnvs 28 z-...@us...-20090112085700-q49z8atyrf1n259o 29 z-...@us...-20090112090352-23u3oxi2irlaw9i6 Modified: armagetronad/branches/0.2.8/build/scripts/configure =================================================================== --- armagetronad/branches/0.2.8/build/scripts/configure 2009-01-12 09:02:12 UTC (rev 8797) +++ armagetronad/branches/0.2.8/build/scripts/configure 2009-01-12 09:08:23 UTC (rev 8798) @@ -6,7 +6,7 @@ source="$1" shift -CONFIGURE=`which $source/configure` +CONFIGURE=`pwd`/${source}/configure echo cd $target cd $target This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2009-09-11 16:59:35
|
Revision: 9265 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9265&view=rev Author: z-man Date: 2009-09-11 16:59:19 +0000 (Fri, 11 Sep 2009) Log Message: ----------- Adapted to new SF upload system, added release notes. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile Added Paths: ----------- armagetronad/branches/0.2.8/build/doc/releasenotes.txt Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2009-09-11 14:10:11 UTC (rev 9264) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2009-09-11 16:59:19 UTC (rev 9265) @@ -49,6 +49,7 @@ $(UPLOAD)/.tag: $(RCDIR)/.tag test -d $(UPLOAD) || mkdir $(UPLOAD) echo "" > $@ + ln doc/releasenotes.txt $(UPLOAD)/ # bump rc number bump: @@ -368,7 +369,7 @@ # ***************************************** # - cd ${UPLOAD}; rsync -avP -e ssh * z-...@fr...:uploads/ + cd ${UPLOAD}; mkdir -p new/$(VERSION); rsync -avP -e ssh new z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/; rmdir new/$(VERSION); rmdir new; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/new/$(VERSION)/ TOEMPTYLINE=sed -e "s,^$$,," -e "t q" -e "p" -e "d" -e ": q" -e "q" Added: armagetronad/branches/0.2.8/build/doc/releasenotes.txt =================================================================== --- armagetronad/branches/0.2.8/build/doc/releasenotes.txt (rev 0) +++ armagetronad/branches/0.2.8/build/doc/releasenotes.txt 2009-09-11 16:59:19 UTC (rev 9265) @@ -0,0 +1,6 @@ +This is a release candidate for Armagetron Advanced 0.2.8.3, which +is planned to be our final release in the 0.2.8 and 0.2 series, apart +from bugfixes and security updates, of course. 0.2.8.3 rounds the +features of the 0.2 development series off with additions like the +new authentication system for players, rendering performance improvements +and better team management in the game. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-26 23:09:26
|
Revision: 9333 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9333&view=rev Author: z-man Date: 2010-01-26 23:09:20 +0000 (Tue, 26 Jan 2010) Log Message: ----------- Building sort of proper ubuntu .deb files from the latest ubuntu build files just injected into our source. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile Added Paths: ----------- armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-25 23:11:01 UTC (rev 9332) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-26 23:09:20 UTC (rev 9333) @@ -344,6 +344,30 @@ # find $(RCDIR) -name "$(PACKAGE)*.deb" -exec mv \{\} $(UPLOAD) \; +UBUNTUSOURCEDIR=$(SOURCEDIR)-ubuntu +ubuntuprepare: $(UBUNTUSOURCEDIR) +$(UBUNTUSOURCEDIR): $(SOURCEDIR)/.tag $(UPLOAD) + # + # ***************************************** + # * prepare ubuntu build * + # ***************************************** + # + cp -ax $(SOURCEDIR) $@ +# adapt the following line as ubuntu releases get updated + bzr pull -d ../ubuntu || bzr branch lp:ubuntu/lucid/armagetronad ../ubuntu + cp -ax ../ubuntu/debian $@/debian + chmod 755 $@/debian/rules +# build changelog + sed -e "s/@package@/$(PACKAGE)/g" -e "s/@version@/$(VERSION)~ppa${RC}/g" -e "s;@date@;$$(date -R);g" < doc/ubuntu-changelog.txt > $@/debian/changelog + cat < ../ubuntu/debian/changelog >> $@/debian/changelog +# build debian package + cd $@; fakeroot debian/rules binary +# harvesting debian package(s) + find $(UBUNTUSOURCEDIR)/../ -name "$(PACKAGE)*.deb" -exec mv \{\} $(UPLOAD) \; + touch $@/.tag + +ubuntu: $(UBUNTUSOURCEDIR) + APFILE=$(RCDIR)/.package autopackage-client: $(APFILE).client autopackage-server: $(APFILE).server Added: armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt =================================================================== --- armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt (rev 0) +++ armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt 2010-01-26 23:09:20 UTC (rev 9333) @@ -0,0 +1,7 @@ +@package@ (@version@) unstable; urgency=low + + * just slapping the new upstream code around the ubuntu distribution files. + + -- Manuel Moos <z-...@us...> @date@ + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-27 07:11:06
|
Revision: 9335 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9335&view=rev Author: z-man Date: 2010-01-27 07:11:00 +0000 (Wed, 27 Jan 2010) Log Message: ----------- Working ppa upload, yay. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-27 00:46:04 UTC (rev 9334) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-27 07:11:00 UTC (rev 9335) @@ -324,7 +324,10 @@ # * prepare debian build * # ***************************************** # - cp -ax $(SOURCEDIR) $@ + mkdir -p $(RCDIR)/tmp + cd $(RCDIR)/tmp; tar -xf ../../../../$(INPUTTARBALLBASE) + mv $(RCDIR)/tmp/$(PACKAGE)-$(VERSION) $@ + rmdir $(RCDIR)/tmp cp -ax debian $@ chmod 755 $@/debian/rules @@ -347,14 +350,17 @@ DEBVERSION=$(subst _,~,${VERSION})~ppa${RC} UBUNTUSOURCEDIR=$(RCDIR)/$(PACKAGE)-$(DEBVERSION) -$(UBUNTUSOURCEDIR)/.tag: $(SOURCEDIR)/.tag $(UPLOAD)/.tag +$(UBUNTUSOURCEDIR)/.tag: $(INPUTTARBALLBASE) $(UPLOAD)/.tag # # ***************************************** # * prepare ubuntu build * # ***************************************** # echo $(DEBVERSION) - cp -ax $(SOURCEDIR) $(UBUNTUSOURCEDIR) + mkdir -p $(RCDIR)/tmp2 + cd $(RCDIR)/tmp2; tar -xf ../../../../$(INPUTTARBALLBASE) + mv $(RCDIR)/tmp2/$(PACKAGE)-$(VERSION) $(UBUNTUSOURCEDIR) + rmdir $(RCDIR)/tmp2 # adapt the following line as ubuntu releases get updated bzr pull -d ../ubuntu || bzr branch lp:ubuntu/armagetronad ../ubuntu cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)/debian @@ -377,7 +383,7 @@ ubuntu: $(RCDIR)/ubuntu.tag -$(RCDIR)/${PACKAGE}_${DEBVERSION}_source.changes: $(UBUNTUSOURCEDIR) +$(RCDIR)/${PACKAGE}_${DEBVERSION}_source.changes: $(UBUNTUSOURCEDIR)/.tag # # ***************************************** # * preparing ubuntu source for ppa * Modified: armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt =================================================================== --- armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt 2010-01-27 00:46:04 UTC (rev 9334) +++ armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt 2010-01-27 07:11:00 UTC (rev 9335) @@ -1,4 +1,4 @@ -@package@ (@version@) unstable; urgency=low +@package@ (@version@) karmic; urgency=low * just slapping the new upstream code around the ubuntu distribution files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-28 23:58:40
|
Revision: 9340 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9340&view=rev Author: z-man Date: 2010-01-28 23:58:34 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Allowing to build ubuntu version specific .deb files Modified Paths: -------------- armagetronad/branches/0.2.8/build/README.txt armagetronad/branches/0.2.8/build/WorkMakefile armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt Modified: armagetronad/branches/0.2.8/build/README.txt =================================================================== --- armagetronad/branches/0.2.8/build/README.txt 2010-01-28 08:41:00 UTC (rev 9339) +++ armagetronad/branches/0.2.8/build/README.txt 2010-01-28 23:58:34 UTC (rev 9340) @@ -33,6 +33,16 @@ debian builds debian packages ( not yet complete ) +ubuntu + builds ubuntu archive with your current distribution, supposedly compatible with + other versions. +ubuntu-<release codename> + builds ubuntu package specialized for the given distribution. +upload-ubuntu + uploads generic ubuntu source package to default PPA specified in ~/.dput.cf +upload-ubuntu-<release codename> + uploads distribution-specific ubuntu source package to default PPA specified in ~/.dput.cf + autopackage.client and autopackage.server builds autopackage client resp. server. Note: libxml2 is linked statically. You should therefore have a version of libxml2 compiled with apgcc. Use Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-28 08:41:00 UTC (rev 9339) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2010-01-28 23:58:34 UTC (rev 9340) @@ -9,7 +9,7 @@ rpm-mdkded: mandriva-dedicated # everything z-man can build at home and work -z-man-home: tarsource zipsource webdoc windoc autopackage +z-man-home: tarsource zipsource webdoc windoc autopackage ubuntu-hardy z-man-work: autopackage-legacyserver autopackage-client # other builders are invited to add their build sets. @@ -348,60 +348,73 @@ find $(RCDIR) -name "$(PACKAGE)*.deb" -exec mv \{\} $(UPLOAD) \; -DEBVERSION=$(subst _,~,${VERSION})~ppa${RC} +DEBVERSION=$(subst _,~,${VERSION})~ppa UBUNTUSOURCEDIR=$(RCDIR)/$(PACKAGE)-$(DEBVERSION) -$(UBUNTUSOURCEDIR)/.tag: $(INPUTTARBALLBASE) $(UPLOAD)/.tag +$(UBUNTUSOURCEDIR)%.tag: $(INPUTTARBALLBASE) $(UPLOAD)/.tag # # ***************************************** # * prepare ubuntu build * # ***************************************** # - rm -rf $(UBUNTUSOURCEDIR) + rm -rf $(UBUNTUSOURCEDIR)$* mkdir -p $(RCDIR)/tmp2 cd $(RCDIR)/tmp2; tar -xf ../../../../$(INPUTTARBALLBASE) - mv $(RCDIR)/tmp2/$(PACKAGE)-$(VERSION) $(UBUNTUSOURCEDIR) + mv $(RCDIR)/tmp2/$(PACKAGE)-$(VERSION) $(UBUNTUSOURCEDIR)$* rmdir $(RCDIR)/tmp2 # adapt the following line as ubuntu releases get updated bzr pull -d ../ubuntu || bzr branch lp:ubuntu/armagetronad ../ubuntu - cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)/debian + cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)$*/debian # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done - for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done - chmod 755 $(UBUNTUSOURCEDIR)/debian/rules + for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" > $(UBUNTUSOURCEDIR)$*/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done + chmod 755 $(UBUNTUSOURCEDIR)$*/debian/rules # build changelog - sed -e "s/@package@/$(PACKAGE)/g" -e "s/@version@/${DEBVERSION}/g" -e "s;@date@;$$(date -R);g" < doc/ubuntu-changelog.txt > $(UBUNTUSOURCEDIR)/debian/changelog - cat < ../ubuntu/debian/changelog >> $(UBUNTUSOURCEDIR)/debian/changelog - touch $@ + DIST="`echo $* | sed -e s/.*~//`"; test -z $$DIST && DIST=hardy; sed -e "s/@distribution@/$$DIST/g" -e "s/@package@/$(PACKAGE)/g" -e "s/@version@/${DEBVERSION}$*/g" -e "s;@date@;$$(date -R);g" < doc/ubuntu-changelog.txt > $(UBUNTUSOURCEDIR)$*/debian/changelog + cat < ../ubuntu/debian/changelog >> $(UBUNTUSOURCEDIR)$*/debian/changelog + echo "x" > $@ -$(RCDIR)/ubuntu.tag: $(UBUNTUSOURCEDIR)/.tag +$(RCDIR)/ubuntu%.tag: $(UBUNTUSOURCEDIR)%.tag # # ***************************************** # * ubuntu build * # ***************************************** # - cd $(UBUNTUSOURCEDIR); fakeroot debian/rules binary + cd $(UBUNTUSOURCEDIR)$*; fakeroot debian/rules binary # harvesting debian package(s) find $(RCDIR) -name "$(PACKAGE)*.deb" -exec mv \{\} $(UPLOAD) \; - touch $@ + echo "x" > $@ -ubuntu: $(RCDIR)/ubuntu.tag +xubuntu-build-%: $(RCDIR)/ubuntu%.tag + echo $@ -$(RCDIR)/${PACKAGE}_${DEBVERSION}_source.changes: $(UBUNTUSOURCEDIR)/.tag +#real targets for the user +ubuntu: xubuntu-build-$(RC) + echo $@ +ubuntu-%: xubuntu-build-$(RC)~% + echo $@ + +$(RCDIR)/${PACKAGE}_${DEBVERSION}%_source.changes: $(UBUNTUSOURCEDIR)%.tag # - # ***************************************** - # * preparing ubuntu source for ppa * - # ***************************************** + # ************************************ + # * preparing ubuntu source for ppa * + # ************************************ # - cd $(UBUNTUSOURCEDIR) && debuild -S -sa + cd $(UBUNTUSOURCEDIR)$* && debuild -S -sa -upload-ubuntu: $(RCDIR)/${PACKAGE}_${DEBVERSION}_source.changes +xupload-ubuntu-%: $(RCDIR)/${PACKAGE}_${DEBVERSION}%_source.changes # - # ***************************************** - # * uploading ubuntu source to ppa * - # ***************************************** + # *********************************** + # * uploading ubuntu source to ppa * + # *********************************** # - cd $(RCDIR) && dput ${PACKAGE}_${DEBVERSION}_source.changes + cd $(RCDIR) && dput ${PACKAGE}_${DEBVERSION}$*_source.changes +#real targets for the user +upload-ubuntu: xupload-ubuntu-$(RC) + echo $@ +upload-ubuntu-%: xupload-ubuntu-$(RC)~% + echo $@ + APFILE=$(RCDIR)/.package autopackage-client: $(APFILE).client autopackage-server: $(APFILE).server Modified: armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt =================================================================== --- armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt 2010-01-28 08:41:00 UTC (rev 9339) +++ armagetronad/branches/0.2.8/build/doc/ubuntu-changelog.txt 2010-01-28 23:58:34 UTC (rev 9340) @@ -1,4 +1,4 @@ -@package@ (@version@) karmic; urgency=low +@package@ (@version@) @distribution@; urgency=low * just slapping the new upstream code around the ubuntu distribution files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-30 11:04:14
|
Revision: 9346 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9346&view=rev Author: z-man Date: 2010-01-30 11:04:07 +0000 (Sat, 30 Jan 2010) Log Message: ----------- "make sourcechange" now really works. Modified Paths: -------------- armagetronad/branches/0.2.8/build/IncludesMakefile2 armagetronad/branches/0.2.8/build/Makefile armagetronad/branches/0.2.8/build/scripts/copysrc Modified: armagetronad/branches/0.2.8/build/IncludesMakefile2 =================================================================== --- armagetronad/branches/0.2.8/build/IncludesMakefile2 2010-01-30 00:25:14 UTC (rev 9345) +++ armagetronad/branches/0.2.8/build/IncludesMakefile2 2010-01-30 11:04:07 UTC (rev 9346) @@ -28,10 +28,6 @@ sinclude $(SOURCETAG) -resource: - rm -f $(SOURCETAG) - make $(SOURCETAG) - VERSIONTAG=builds/.versionfile # dummy values; should be overwritten later by include files Modified: armagetronad/branches/0.2.8/build/Makefile =================================================================== --- armagetronad/branches/0.2.8/build/Makefile 2010-01-30 00:25:14 UTC (rev 9345) +++ armagetronad/branches/0.2.8/build/Makefile 2010-01-30 11:04:07 UTC (rev 9346) @@ -43,6 +43,8 @@ # rm -f make.conf +sinclude make.conf + sourcechange: # # ***************************************** @@ -50,4 +52,6 @@ # ***************************************** # rm -f tarballs/.sourcetag tarballs/*.tar* + cd $(AA_SOURCE) && rm -f src/doc/commands.txt && ./bootstrap.sh + cd tarballs/distmaker && rm armagetronad-* -rf && rm $(PACKAGE)-* -rf && ./config.status --recheck Modified: armagetronad/branches/0.2.8/build/scripts/copysrc =================================================================== --- armagetronad/branches/0.2.8/build/scripts/copysrc 2010-01-30 00:25:14 UTC (rev 9345) +++ armagetronad/branches/0.2.8/build/scripts/copysrc 2010-01-30 11:04:07 UTC (rev 9346) @@ -41,6 +41,9 @@ mkdir -p $TARGET/distmaker lwd=`pwd` cd $TARGET/distmaker +rm -rf armagetronad-* +rm -rf ${PACKAGE}-* +rm -f *.tar.* test -r config.h || progname="${PACKAGE}" progtitle="${PROGNAME}" docstyle=web $CWD/$AA_SOURCE/configure --prefix=/usr/local --disable-glout --enable-automakedefaults --disable-useradd --disable-etc --disable-initscripts || exit -1 ${MAKE} distprep || exit -1 ${MAKE} dist || exit -1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2010-01-30 14:35:39
|
Revision: 9351 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9351&view=rev Author: z-man Date: 2010-01-30 14:35:30 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Still better 'make sourcechange'. Modified Paths: -------------- armagetronad/branches/0.2.8/build/Makefile armagetronad/branches/0.2.8/build/scripts/copysrc Modified: armagetronad/branches/0.2.8/build/Makefile =================================================================== --- armagetronad/branches/0.2.8/build/Makefile 2010-01-30 14:33:57 UTC (rev 9350) +++ armagetronad/branches/0.2.8/build/Makefile 2010-01-30 14:35:30 UTC (rev 9351) @@ -52,6 +52,6 @@ # ***************************************** # rm -f tarballs/.sourcetag tarballs/*.tar* - cd $(AA_SOURCE) && rm -f src/doc/commands.txt && ./bootstrap.sh - cd tarballs/distmaker && rm armagetronad-* -rf && rm $(PACKAGE)-* -rf && ./config.status --recheck + cd $(AA_SOURCE) && rm -f src/doc/commands.txt + cd tarballs/distmaker && rm armagetronad-* -rf && rm $(PACKAGE)-* -rf Modified: armagetronad/branches/0.2.8/build/scripts/copysrc =================================================================== --- armagetronad/branches/0.2.8/build/scripts/copysrc 2010-01-30 14:33:57 UTC (rev 9350) +++ armagetronad/branches/0.2.8/build/scripts/copysrc 2010-01-30 14:35:30 UTC (rev 9351) @@ -13,15 +13,11 @@ # generate automatic files CWD=`pwd` if test -z "$VERSION"; then - if test -r $AA_SOURCE/version && test -r $AA_SOURCE/configure && test -r $AA_SOURCE/ChangeLog ; then - echo "No bootstrap required." - else - # bootstrap - lwd=`pwd` - cd $AA_SOURCE - sh ./bootstrap.sh || exit -1 - cd ${lwd} - fi + # bootstrap + lwd=`pwd` + cd $AA_SOURCE + sh ./bootstrap.sh || exit -1 + cd ${lwd} # adapt version to source VERSION=`sed -e 's,.*\[,,' -e 's,\].*,,' < $AA_SOURCE/version` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-20 02:26:08
|
Revision: 9570 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9570&view=rev Author: z-man Date: 2011-07-20 02:26:02 +0000 (Wed, 20 Jul 2011) Log Message: ----------- Adapting and using launchpad upload python script. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile armagetronad/branches/0.2.8/build/make.conf.template armagetronad/branches/0.2.8/build/scripts/lp-upload Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-20 02:22:56 UTC (rev 9569) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-20 02:26:02 UTC (rev 9570) @@ -407,7 +407,7 @@ # * uploading ubuntu source to ppa * # *********************************** # - cd $(RCDIR) && dput ${PACKAGE}_${DEBVERSION}$*_source.changes + cd $(RCDIR) && dput ppa:armagetronad-dev/ppa ${PACKAGE}_${DEBVERSION}$*_source.changes #real targets for the user upload-ubuntu: xupload-ubuntu-$(RC) @@ -432,15 +432,25 @@ rm -rf ap-$* touch $@ -upload: $(UPLOAD)/.tag +upload-lp: $(SOURCEDIR)/.tag $(UPLOAD)/.tag # # ***************************************** + # * uploading compiled files to lp * + # ***************************************** + # + cp doc/releasenotes.txt $(UPLOAD)/ + cp $(SOURCEDIR)/ChangeLog $(UPLOAD)/ + cd ${UPLOAD}; ../../../../scripts/lp-upload armagetronad "$(SERIES)" "$(VERSION)" *.gz *.bz2 *.zip *.deb *.package *.rpm + +upload-sf: $(UPLOAD)/.tag + # + # ***************************************** # * uploading compiled files to sf * # ***************************************** # cp doc/releasenotes.txt $(UPLOAD)/ - unix2dos $(UPLOAD)/releasenotes.txt + todos $(UPLOAD)/releasenotes.txt cd ${UPLOAD}; mkdir -p new/$(VERSION); rsync -avP -e ssh new z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/; rmdir new/$(VERSION); rmdir new; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/new/$(VERSION)/ TOEMPTYLINE=sed -e "s,^$$,," -e "t q" -e "p" -e "d" -e ": q" -e "q" Modified: armagetronad/branches/0.2.8/build/make.conf.template =================================================================== --- armagetronad/branches/0.2.8/build/make.conf.template 2011-07-20 02:22:56 UTC (rev 9569) +++ armagetronad/branches/0.2.8/build/make.conf.template 2011-07-20 02:26:02 UTC (rev 9570) @@ -7,6 +7,9 @@ #prefix to install the program to PREFIX=/usr/local +# Launchpad series +SERIES=0.2.8 + # RPM build root #RPMBUILDROOT="%{_tmppath}/%{name}-%{version}-root" Modified: armagetronad/branches/0.2.8/build/scripts/lp-upload =================================================================== --- armagetronad/branches/0.2.8/build/scripts/lp-upload 2011-07-20 02:22:56 UTC (rev 9569) +++ armagetronad/branches/0.2.8/build/scripts/lp-upload 2011-07-20 02:26:02 UTC (rev 9570) @@ -27,18 +27,20 @@ from ubuntutools.lp.libsupport import get_launchpad from launchpadlib.errors import HTTPError -def create_release(project, version): +def create_release(project, series_name, version): '''Create new release and milestone for LP project.''' - print 'Release %s could not be found for project. Create it? (Y/n)' % version - answer = sys.stdin.readline().strip() - if answer.startswith('n'): - sys.exit(0) - if len(proj.series) != 1: - print >> sys.stderr, 'Does not support creating releases if more than one series exists.' + series = None + for ser in proj.series: + if ser.display_name == series_name: + series = ser + break + if not series: + print >> sys.stderr, 'Series %s not found, available:' % series_name + for s in proj.series.entries: + print '%s: %s' % (s['display_name'], s['summary']) sys.exit(3) release_date = datetime.date.today().strftime('%Y-%m-%d') - series = proj.series[0] milestone = series.newMilestone(name=version, date_targeted=release_date) return milestone.createProductRelease(date_released=release_date) @@ -62,12 +64,15 @@ # if len(sys.argv) < 4: - print >> sys.stderr, '''Upload a release tarball to a Launchpad project. + print >> sys.stderr, '''Upload a release to a Launchpad project. -Usage: %s <project name> <version> <tarball> <optional builds>''' % sys.argv[0] +Usage: %s <project name> <series> <version> <builds>''' % sys.argv[0] sys.exit(1) -(project, version, tarball) = sys.argv[1:] +(project, series, version) = sys.argv[1:4] +version=version.replace('_','-') +builds = sys.argv[4:] +#print builds def prepare_file( filename ): # Get the signature, if available. @@ -80,19 +85,22 @@ def upload_file( filename, description, mime_type, file_type ): # Get the file contents. file_content = open(filename, 'r').read() - + print "adding %s: %s, %s, %s..." % (filename, file_type, description, mime_type) + signature = filename + '.asc' - + if os.path.exists(signature): signature_content = open(signature, 'r').read() else: signature_content = None - + # Create a new product release file. - release.add_file(filename=filename, description='release tarball', - file_content=file_content, content_type='appplication/x-gzip', - file_type='Code Release Tarball', signature_filename=signature, + release.add_file(filename=filename, description=description, + file_content=file_content, content_type=mime_type, + file_type=file_type, signature_filename=signature, signature_content=signature_content) + + print "done." try: lp = get_launchpad('ubuntu-dev-tools') @@ -101,6 +109,50 @@ sys.exit(2) try: + uploads=[] + for f in builds: + if os.path.exists(f): + prepare_file(f) + basename, extension = os.path.splitext(f) + basename, secondextension = os.path.splitext(basename) + basename, thirdextension = os.path.splitext(basename) + # print basename, thirdextension, secondextension, extension + + # default types + mime_type="application/octet-stream" + file_type="Installer file" + description="Unknown" + + if secondextension == ".src" or thirdextension == ".src": + file_type="Code Release Tarball" + description="Source Tarball" + if extension == '.bz2': + mime_type="application/bzip2" + if extension == '.gz': + mime_type="application/x-gzip" + if extension == '.zip': + mime_type="application/zip" + description="Source zip for Windows builds" + else: + if extension == ".package": + description="Autopackage Installer for Linux" + if extension == ".deb": + description="Debian Package" + if extension == ".dmg": + description="OSX Disk Image" + mime_type="application/x-apple-diskimage" + if extension == ".exe": + description="Windows Installer" + mime_type="application/exe" + if "dedicated" in f: + description="Server " + description + else: + description="Client " + description + + #print f,description,mime_type,file_type + + uploads.append((f,description,mime_type,file_type)) + # Look up the project using the Launchpad instance. proj = lp.projects[project] # Find the release in the project's releases collection. @@ -108,21 +160,35 @@ for rel in proj.releases: if rel.version == version: release = rel + print "Found release %s already existing." % version break if not release: - release = create_release(proj, version) + print "Creating release %s..." % version + release = create_release(proj, series, version) + + print "Setting changelog..." + changelog = "ChangeLog" + if os.path.exists(changelog): + release.changelog = open(changelog, 'r').read().strip() + else: + changelog = edit_file('changelog', 'changelog') + if changelog: + release.changelog = changelog + + print "Setting release notes..." + release_notes = "releasenotes.txt" + if os.path.exists(release_notes): + release.release_notes = open(release_notes, 'r').read().strip() + else: + release_notes = edit_file('releasenotes', 'release notes') + if release_notes: + release.release_notes = release_notes - prepare_file(tarball) + print "Uploading..." + for upload in uploads: + upload_file(upload[0], upload[1], upload[2], upload[3]) + # upload_file(tarball, 'release tarball','appplication/x-gzip', 'Code Release Tarball') - changelog = edit_file('changelog', 'changelog') - if changelog: - release.changelog = changelog - release_notes = edit_file('releasenotes', 'release notes') - if release_notes: - release.release_notes = release_notes - - upload_file(tarball, 'release tarball','appplication/x-gzip', 'Code Release Tarball') - release.lp_save() except HTTPError, e: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-20 12:38:08
|
Revision: 9578 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9578&view=rev Author: z-man Date: 2011-07-20 12:37:57 +0000 (Wed, 20 Jul 2011) Log Message: ----------- Patching uninstaller out of ubuntu build. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile Added Paths: ----------- armagetronad/branches/0.2.8/build/patches/ armagetronad/branches/0.2.8/build/patches/ubuntu.patch Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-20 12:05:16 UTC (rev 9577) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-20 12:37:57 UTC (rev 9578) @@ -364,6 +364,7 @@ # adapt the following line as ubuntu releases get updated bzr pull -d ../ubuntu || bzr branch lp:ubuntu/armagetronad ../ubuntu cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)$*/debian + patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu.patch # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" > $(UBUNTUSOURCEDIR)$*/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done Added: armagetronad/branches/0.2.8/build/patches/ubuntu.patch =================================================================== --- armagetronad/branches/0.2.8/build/patches/ubuntu.patch (rev 0) +++ armagetronad/branches/0.2.8/build/patches/ubuntu.patch 2011-07-20 12:37:57 UTC (rev 9578) @@ -0,0 +1,13 @@ +=== modified file 'debian/rules' +--- debian/rules 2009-11-27 12:17:04 +0000 ++++ debian/rules 2011-07-20 12:30:54 +0000 +@@ -33,7 +33,7 @@ + endif + + # Special options to ./configure for client and server builds. +-SHARED_OPTS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" ++SHARED_OPTS := --disable-uninstall --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" + SERVER_OPTS := --disable-glout --disable-useradd --disable-init + CLIENT_OPTS := --enable-glout + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-07-22 17:52:48
|
Revision: 9618 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9618&view=rev Author: z-man Date: 2011-07-22 17:52:42 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Rebranding Windows installers. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile armagetronad/branches/0.2.8/build/scripts/winsrc Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-22 17:24:48 UTC (rev 9617) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2011-07-22 17:52:42 UTC (rev 9618) @@ -302,7 +302,7 @@ # test "$(AA_VISUALC)" != "" || { echo -e "\nCVS module armagetronad_build_visualc needs to be checked out parallel to this directory for Windows source build.\n"; false; } rm -rf $@ $@-proto $(RCDIR)/$(PACKAGE) - VERSION=$(VERSION) bash scripts/winsrc $@-proto $(SOURCEDIR) $(WINBUILDDIR) $(WINDOCDIR) $(AA_VISUALC) $(AA_CODEBLOCKS) + PROGNAME=$(PROGNAME) VERSION=$(VERSION) bash scripts/winsrc $@-proto $(SOURCEDIR) $(WINBUILDDIR) $(WINDOCDIR) $(AA_VISUALC) $(AA_CODEBLOCKS) mv $@-proto $@ touch $@ Modified: armagetronad/branches/0.2.8/build/scripts/winsrc =================================================================== --- armagetronad/branches/0.2.8/build/scripts/winsrc 2011-07-22 17:24:48 UTC (rev 9617) +++ armagetronad/branches/0.2.8/build/scripts/winsrc 2011-07-22 17:52:42 UTC (rev 9618) @@ -42,9 +42,14 @@ # transcribe nsi scripts for f in `ls ${VISUALC} -1 | grep ".*.nsi$"`; do #echo Adapting installer script $f... - sed < ${VISUALC}/$f > ${WINDIR}/$f -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${VERSION}\"," + sed < ${VISUALC}/$f > ${WINDIR}/$f \ + -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${VERSION}\"," \ + -e "s,define PRODUCT_BASENAME.*$,define PRODUCT_BASENAME \"${PROGNAME}\"," \ + for suffix in gcc vc6 vc8; do - sed < ${VISUALC}/$f > ${WINDIR}/${suffix}.$f -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${VERSION}.${suffix}\"," + sed < ${VISUALC}/$f > ${WINDIR}/${suffix}.$f \ + -e "s,define PRODUCT_VERSION.*$,define PRODUCT_VERSION \"${VERSION}.${suffix}\"," \ + -e "s,define PRODUCT_BASENAME.*$,define PRODUCT_BASENAME \"${PROGNAME}\"," \ # generate special makedist script that copies only the wanted installer generators MAKEDIST=${WINDIR}/makedist_${suffix}.bat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2011-08-02 02:44:05
|
Revision: 9638 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9638&view=rev Author: z-man Date: 2011-08-02 02:43:59 +0000 (Tue, 02 Aug 2011) Log Message: ----------- Adding patch for server vardir sanity. Modified Paths: -------------- armagetronad/branches/0.2.8/build/WorkMakefile Added Paths: ----------- armagetronad/branches/0.2.8/build/patches/ubuntu-vardir.patch Modified: armagetronad/branches/0.2.8/build/WorkMakefile =================================================================== --- armagetronad/branches/0.2.8/build/WorkMakefile 2011-08-01 19:11:47 UTC (rev 9637) +++ armagetronad/branches/0.2.8/build/WorkMakefile 2011-08-02 02:43:59 UTC (rev 9638) @@ -365,6 +365,8 @@ bzr pull -d ../ubuntu || bzr branch lp:ubuntu/armagetronad ../ubuntu cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)$*/debian patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu.patch +# for later. Fixes var dir location of dedicated server, now it would break stuff. +# patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu-vardir.patch # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" > $(UBUNTUSOURCEDIR)$*/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done Added: armagetronad/branches/0.2.8/build/patches/ubuntu-vardir.patch =================================================================== --- armagetronad/branches/0.2.8/build/patches/ubuntu-vardir.patch (rev 0) +++ armagetronad/branches/0.2.8/build/patches/ubuntu-vardir.patch 2011-08-02 02:43:59 UTC (rev 9638) @@ -0,0 +1,18 @@ +=== modified file 'debian/armagetronad-dedicated.wrapper' +--- debian/armagetronad-dedicated.wrapper 2007-04-24 11:38:26 +0000 ++++ debian/armagetronad-dedicated.wrapper 2011-07-28 17:13:30 +0000 +@@ -5,11 +5,11 @@ + DATADIR=/usr/share/games/armagetronad + CONFDIR=/etc/armagetronad + +-CMDLINE="--datadir $DATADIR --configdir $CONFDIR -d" +- + # Source configuration variables. + . /etc/default/armagetronad-dedicated + ++CMDLINE="--datadir $DATADIR --configdir $CONFDIR --userdatadir $VARDIR -d" ++ + # Array for keeping track of start times. + declare -a STARTDATE_LOG + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |