From: <st...@us...> - 2007-01-31 23:49:42
|
Revision: 349 http://safekeep.svn.sourceforge.net/safekeep/?rev=349&view=rev Author: stelian Date: 2007-01-31 15:49:41 -0800 (Wed, 31 Jan 2007) Log Message: ----------- Build DEBs in /tmp to avoid cluttering the source dir. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-01-31 23:28:33 UTC (rev 348) +++ safekeep/trunk/Makefile 2007-01-31 23:49:41 UTC (rev 349) @@ -93,14 +93,14 @@ deb: deb-snapshot deb-snapshot: tar-snapshot - tar xz -f $(snapshotname).tar.gz - cd $(snapshotname) && debuild --check-dirname-regex 'safekeep(-.*)?' - rm -rf $(snapshotname) $(snapshotname).tar.gz + tar xz -C /tmp -f $(snapshotname).tar.gz + rm -rf $(snapshotname).tar.gz + cd /tmp/$(snapshotname) && debuild --check-dirname-regex 'safekeep(-.*)?' deb-release: tar-release - tar xz -f $(releasename).tar.gz - cd $(releasename) && debuild --check-dirname-regex 'safekeep(-.*)?' - rm -rf $(releasename) $(releasename).tar.gz + tar xz -C /tmp -f $(releasename).tar.gz + rm -rf $(releasename).tar.gz + cd /tmp/$(releasename) && debuild --check-dirname-regex 'safekeep(-.*)?' rpm: rpm-snapshot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-02-02 00:57:51
|
Revision: 361 http://safekeep.svn.sourceforge.net/safekeep/?rev=361&view=rev Author: dimi Date: 2007-02-01 16:57:50 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Whitespace fix Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-02-02 00:53:10 UTC (rev 360) +++ safekeep/trunk/Makefile 2007-02-02 00:57:50 UTC (rev 361) @@ -9,7 +9,7 @@ tagname := $(shell echo Release-$(releasename) | tr . _) dirname := $(shell basename $(PWD)) rpmroot := $(shell grep '%_topdir' ~/.rpmmacros | sed 's/^[^ \t]*[ \t]*//') -svnroot := $(shell LANG=C svn info |grep Root |cut -c 18-) +svnroot := $(shell LANG=C svn info | grep Root | cut -c 18-) MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-02-02 01:16:45
|
Revision: 364 http://safekeep.svn.sourceforge.net/safekeep/?rev=364&view=rev Author: dimi Date: 2007-02-01 17:16:43 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Fix copy and paste bug Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-02-02 01:07:12 UTC (rev 363) +++ safekeep/trunk/Makefile 2007-02-02 01:16:43 UTC (rev 364) @@ -84,7 +84,7 @@ rm -rf $(snapshotname) tar-release: - svn export $(svnroot)/safekeep/tags/$(tagname) $(snapshotname) + svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) cat $(releasename)/$(name).spec.in | sed 's/^%define version.*/%define version $(version)/' > $(releasename)/$(name).spec cat $(releasename)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version)) unstable; urgency=low/' > $(releasename)/debian/changelog tar cz -f $(releasename).tar.gz $(releasename) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-03-04 20:15:33
|
Revision: 429 http://safekeep.svn.sourceforge.net/safekeep/?rev=429&view=rev Author: dimi Date: 2007-03-04 12:15:32 -0800 (Sun, 04 Mar 2007) Log Message: ----------- Add migration code to source install as well Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-03-04 20:13:27 UTC (rev 428) +++ safekeep/trunk/Makefile 2007-03-04 20:15:32 UTC (rev 429) @@ -79,6 +79,14 @@ install -m 755 safekeep "/usr/bin/" install -m 755 doc/safekeep.1 "/usr/share/man/man1/" install -m 755 doc/safekeep.conf.5 "/usr/share/man/man5/" + if test -d /etc/safekeep.d; then \ + for file in /etc/safekeep.d/*.conf; do \ + if test -f "$$file"; then \ + mv "$$file" /etc/safekeep/clients.d/`basename "$$file" .conf`.backup \ + fi \ + done \ + rmdir /etc/safekeep.d 2> /dev/null || true \ + fi tar: tar-snapshot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-03-09 16:02:37
|
Revision: 457 http://safekeep.svn.sourceforge.net/safekeep/?rev=457&view=rev Author: dimi Date: 2007-03-09 08:02:28 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Streamline the make targets to be closer to the standard ones. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-03-09 15:28:02 UTC (rev 456) +++ safekeep/trunk/Makefile 2007-03-09 16:02:28 UTC (rev 457) @@ -20,15 +20,19 @@ help: @echo "Targets:" @echo " help Displays this message" - @echo " info Displays package information (version, tag, etc.)" + @echo " info Displays package information (version, etc.)" @echo " install Installs safekeep and the online documentation" @echo " docs Builds all documentation formats" @echo " build Builds everything needed for an installation" + @echo " tar Builds snapshot source distribution" @echo " deb Builds snapshot binary and source DEBs" @echo " rpm Buidls snapshot binary and source RPMs" - @echo " tar Builds snapshot source distribution" - @echo " test Invokes a quick local test for SafeKeep" - @echo " fulltest Invokes a comprehensive remote test for SafeKeep" + @echo " tag Tags the source for release" + @echo " dist Builds release source distribution" + @echo " distdeb Builds release binary and source DEBs" + @echo " distrpm Buidls release binary and source RPMs" + @echo " check Invokes a quick local test for SafeKeep" + @echo " test Invokes a comprehensive remote test for SafeKeep" @echo " clean Cleans up the source tree" info: @@ -43,12 +47,12 @@ build: docs -release: check-info commit-release tag-release rpm-release +release: check-info commit-release dist distrpm commit-release: svn ci -m "Release $(version) (tagged as $(tagname))" -tag-release: +tag: svn cp . $(svnroot)/safekeep/tags/$(tagname) check-info: info @@ -91,50 +95,40 @@ rmdir /etc/safekeep.d 2> /dev/null || true \ fi -tar: tar-snapshot - -tar-snapshot: +tar: svn export -r {'$(timestamp_svn)'} $(svnroot)/safekeep/trunk $(snapshotname) cat $(snapshotname)/$(name).spec.in | sed 's/^%define version.*/%define version $(version).$(version_ts)/' > $(snapshotname)/$(name).spec cat $(snapshotname)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version).$(version_ts)) unstable; urgency=low/' > $(snapshotname)/debian/changelog tar cz -f $(snapshotname).tar.gz $(snapshotname) rm -rf $(snapshotname) -tar-release: +deb: tar + tar xz -C /tmp -f $(snapshotname).tar.gz + rm -rf $(snapshotname).tar.gz + cd /tmp/$(snapshotname) && debuild --check-dirname-regex 'safekeep(-.*)?' + +rpm: tar + rpmbuild -ta $(snapshotname).tar.gz + +dist: svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) cat $(releasename)/$(name).spec.in | sed 's/^%define version.*/%define version $(version)/' > $(releasename)/$(name).spec cat $(releasename)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version)) unstable; urgency=low/' > $(releasename)/debian/changelog tar cz -f $(releasename).tar.gz $(releasename) rm -rf $(releasename) -deb: deb-snapshot - -deb-snapshot: tar-snapshot - tar xz -C /tmp -f $(snapshotname).tar.gz - rm -rf $(snapshotname).tar.gz - cd /tmp/$(snapshotname) && debuild --check-dirname-regex 'safekeep(-.*)?' - -deb-release: tar-release +distdeb: dist tar xz -C /tmp -f $(releasename).tar.gz rm -rf $(releasename).tar.gz cd /tmp/$(releasename) && debuild --check-dirname-regex 'safekeep(-.*)?' -rpm: rpm-snapshot - -rpm-snapshot: tar-snapshot - rpmbuild -ta $(snapshotname).tar.gz - -rpm-release: tar-release +distrpm: dist rpmbuild -ta $(releasename).tar.gz -test: test-local - -fulltest: test-remote - -test-local: +check: safekeep-test --local -test-remote: +test: safekeep-test --remote clean: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-03-09 17:40:50
|
Revision: 458 http://safekeep.svn.sourceforge.net/safekeep/?rev=458&view=rev Author: dimi Date: 2007-03-09 09:40:48 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Fetch the RPMs from the build dirs. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-03-09 16:02:28 UTC (rev 457) +++ safekeep/trunk/Makefile 2007-03-09 17:40:48 UTC (rev 458) @@ -4,6 +4,7 @@ version_num := $(shell grep 'VERSION *=' safekeep | sed s'/[^"]*"\([^"].*\)".*/\1/') version_ts := $(shell date -u -d '$(timestamp)' '+%Y%m%d%H%M') version := $(version_num) +release := 1 releasename := $(name)-$(version) snapshotname:= $(name)-$(version).$(version_ts) tagname := $(shell echo Release-$(releasename) | tr . _) @@ -109,6 +110,8 @@ rpm: tar rpmbuild -ta $(snapshotname).tar.gz + mv $(rpmroot)/SRPMS/$(snapshotname)-$(release).src.rpm . + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version).$(version_ts)-$(release).noarch.rpm . dist: svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) @@ -124,6 +127,9 @@ distrpm: dist rpmbuild -ta $(releasename).tar.gz + mv $(rpmroot)/SRPMS/$(releasename)-$(release).src.rpm . + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release).noarch.rpm . + rpm --addsign $(releasename)-$(release).src.rpm $(name)-*-$(version)-$(release).noarch.rpm check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-03-09 17:49:03
|
Revision: 459 http://safekeep.svn.sourceforge.net/safekeep/?rev=459&view=rev Author: dimi Date: 2007-03-09 09:48:55 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Cleanup snapshots as well Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-03-09 17:40:48 UTC (rev 458) +++ safekeep/trunk/Makefile 2007-03-09 17:48:55 UTC (rev 459) @@ -141,3 +141,4 @@ rm -f {.,doc,debian}/*~ *.py[co] rm -f $(name).spec debian/changelog rm -f doc/*.xml doc/*.html doc/*.[15] + rm -f safekeep-*[.]20[01][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9]* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-05-29 04:24:08
|
Revision: 515 http://safekeep.svn.sourceforge.net/safekeep/?rev=515&view=rev Author: dimi Date: 2007-05-28 21:24:07 -0700 (Mon, 28 May 2007) Log Message: ----------- Do not complain if .rpmmacros doesn't exist. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-05-28 23:58:41 UTC (rev 514) +++ safekeep/trunk/Makefile 2007-05-29 04:24:07 UTC (rev 515) @@ -9,7 +9,7 @@ snapshotname:= $(name)-$(version).$(version_ts) tagname := $(shell echo Release-$(releasename) | tr . _) dirname := $(shell basename $(PWD)) -rpmroot := $(shell grep '%_topdir' ~/.rpmmacros | sed 's/^[^ \t]*[ \t]*//') +rpmroot := $(shell grep '%_topdir' ~/.rpmmacros 2>/dev/null | sed 's/^[^ \t]*[ \t]*//') svnroot := $(shell LANG=C svn info | grep Root | cut -c 18-) MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt doc/safekeep.backup.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 doc/safekeep.backup.5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-05-29 04:30:36
|
Revision: 516 http://safekeep.svn.sourceforge.net/safekeep/?rev=516&view=rev Author: dimi Date: 2007-05-28 21:30:35 -0700 (Mon, 28 May 2007) Log Message: ----------- Do not complain if we can't figure out the SVN root Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-05-29 04:24:07 UTC (rev 515) +++ safekeep/trunk/Makefile 2007-05-29 04:30:35 UTC (rev 516) @@ -10,7 +10,7 @@ tagname := $(shell echo Release-$(releasename) | tr . _) dirname := $(shell basename $(PWD)) rpmroot := $(shell grep '%_topdir' ~/.rpmmacros 2>/dev/null | sed 's/^[^ \t]*[ \t]*//') -svnroot := $(shell LANG=C svn info | grep Root | cut -c 18-) +svnroot := $(shell LANG=C svn info 2>/dev/null | grep Root | cut -c 18-) MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt doc/safekeep.backup.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 doc/safekeep.backup.5 DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-06-08 22:02:23
|
Revision: 522 http://safekeep.svn.sourceforge.net/safekeep/?rev=522&view=rev Author: dimi Date: 2007-06-08 15:02:22 -0700 (Fri, 08 Jun 2007) Log Message: ----------- Account for FC7 adding the distro id (.f7) to the RPM name. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-06-08 21:58:03 UTC (rev 521) +++ safekeep/trunk/Makefile 2007-06-08 22:02:22 UTC (rev 522) @@ -102,8 +102,8 @@ rpm: tar rpmbuild -ta $(snapshotname).tar.gz - mv $(rpmroot)/SRPMS/$(snapshotname)-$(release).src.rpm . - mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version).$(version_ts)-$(release).noarch.rpm . + mv $(rpmroot)/SRPMS/$(snapshotname)-$(release)*.src.rpm . + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version).$(version_ts)-$(release)*.noarch.rpm . dist: svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) @@ -119,9 +119,9 @@ distrpm: dist rpmbuild -ta $(releasename).tar.gz - mv $(rpmroot)/SRPMS/$(releasename)-$(release).src.rpm . - mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release).noarch.rpm . - rpm --addsign $(releasename)-$(release).src.rpm $(name)-*-$(version)-$(release).noarch.rpm + mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm . + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm . + rpm --addsign $(releasename)-$(release).src.rpm $(name)-*-$(version)-$(release)*.noarch.rpm check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-06-08 22:12:00
|
Revision: 523 http://safekeep.svn.sourceforge.net/safekeep/?rev=523&view=rev Author: dimi Date: 2007-06-08 15:11:59 -0700 (Fri, 08 Jun 2007) Log Message: ----------- Collect releases in the releases/ dir. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-06-08 22:02:22 UTC (rev 522) +++ safekeep/trunk/Makefile 2007-06-08 22:11:59 UTC (rev 523) @@ -11,6 +11,7 @@ dirname := $(shell basename $(PWD)) rpmroot := $(shell grep '%_topdir' ~/.rpmmacros 2>/dev/null | sed 's/^[^ \t]*[ \t]*//') svnroot := $(shell LANG=C svn info 2>/dev/null | grep Root | cut -c 18-) +releasedir := releases MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt doc/safekeep.backup.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 doc/safekeep.backup.5 DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT)) @@ -109,19 +110,20 @@ svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) cat $(releasename)/$(name).spec.in | sed 's/^%define version.*/%define version $(version)/' > $(releasename)/$(name).spec cat $(releasename)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version)) unstable; urgency=low/' > $(releasename)/debian/changelog - tar cz -f $(releasename).tar.gz $(releasename) + mkdir -p ${releasedir}; tar cz -f ${releasedir}/$(releasename).tar.gz $(releasename) rm -rf $(releasename) distdeb: dist - tar xz -C /tmp -f $(releasename).tar.gz - rm -rf $(releasename).tar.gz + tar xz -C /tmp -f ${releasedir}/$(releasename).tar.gz + rm -rf ${releasedir}/$(releasename).tar.gz cd /tmp/$(releasename) && debuild --check-dirname-regex 'safekeep(-.*)?' + mv /tmp/$(releasename)/safekeep*deb ${releasedir} distrpm: dist - rpmbuild -ta $(releasename).tar.gz - mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm . - mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm . - rpm --addsign $(releasename)-$(release).src.rpm $(name)-*-$(version)-$(release)*.noarch.rpm + rpmbuild -ta ${releasedir}/$(releasename).tar.gz + mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm ${releasedir} + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm ${releasedir} + rpm --addsign ${releasedir}/$(releasename)-$(release).src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-06-17 22:45:10
|
Revision: 531 http://safekeep.svn.sourceforge.net/safekeep/?rev=531&view=rev Author: dimi Date: 2007-06-17 15:45:09 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Make the tag fully automatic Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-06-17 22:39:13 UTC (rev 530) +++ safekeep/trunk/Makefile 2007-06-17 22:45:09 UTC (rev 531) @@ -55,7 +55,7 @@ svn ci -m "Release $(version) (tagged as $(tagname))" tag: - svn cp . $(svnroot)/safekeep/tags/$(tagname) + svn cp -m "Tag safekeep $(version)" . $(svnroot)/safekeep/tags/$(tagname) check-info: info @echo -n 'Is this information correct? (yes/No) ' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-06-17 22:48:00
|
Revision: 532 http://safekeep.svn.sourceforge.net/safekeep/?rev=532&view=rev Author: dimi Date: 2007-06-17 15:47:58 -0700 (Sun, 17 Jun 2007) Log Message: ----------- Tiny fix for Fedora 7 Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-06-17 22:45:09 UTC (rev 531) +++ safekeep/trunk/Makefile 2007-06-17 22:47:58 UTC (rev 532) @@ -123,7 +123,7 @@ rpmbuild -ta ${releasedir}/$(releasename).tar.gz mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm ${releasedir} mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm ${releasedir} - rpm --addsign ${releasedir}/$(releasename)-$(release).src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm + rpm --addsign ${releasedir}/$(releasename)-$(release)*.src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-10-19 16:38:48
|
Revision: 552 http://safekeep.svn.sourceforge.net/safekeep/?rev=552&view=rev Author: dimi Date: 2007-10-19 09:38:47 -0700 (Fri, 19 Oct 2007) Log Message: ----------- Add target to deploy latest docs to website Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-10-19 16:37:28 UTC (rev 551) +++ safekeep/trunk/Makefile 2007-10-19 16:38:47 UTC (rev 552) @@ -12,6 +12,7 @@ rpmroot := $(shell grep '%_topdir' ~/.rpmmacros 2>/dev/null | sed 's/^[^ \t]*[ \t]*//') svnroot := $(shell LANG=C svn info 2>/dev/null | grep Root | cut -c 18-) releasedir := releases +webroot := ../website/WebContent/ MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt doc/safekeep.backup.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 doc/safekeep.backup.5 DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT)) @@ -25,6 +26,7 @@ @echo " info Displays package information (version, etc.)" @echo " install Installs safekeep and the online documentation" @echo " docs Builds all documentation formats" + @echo " web Updates the website to the latest documentation" @echo " build Builds everything needed for an installation" @echo " tar Builds snapshot source distribution" @echo " deb Builds snapshot binary and source DEBs" @@ -61,6 +63,10 @@ @echo -n 'Is this information correct? (yes/No) ' @read x; if [ "$$x" != "yes" ]; then exit 1; fi +web: html + cp doc/*.html $(webroot) + cd $(webroot); svn ci -m "Update man pages on website to latest as of $(timestamp)" + docs: html man html: $(DOC_HTML) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-10-19 17:10:29
|
Revision: 556 http://safekeep.svn.sourceforge.net/safekeep/?rev=556&view=rev Author: dimi Date: 2007-10-19 10:10:27 -0700 (Fri, 19 Oct 2007) Log Message: ----------- Add simple deploy target to deploy RPMs to YUM repo Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-10-19 16:56:40 UTC (rev 555) +++ safekeep/trunk/Makefile 2007-10-19 17:10:27 UTC (rev 556) @@ -12,6 +12,8 @@ rpmroot := $(shell grep '%_topdir' ~/.rpmmacros 2>/dev/null | sed 's/^[^ \t]*[ \t]*//') svnroot := $(shell LANG=C svn info 2>/dev/null | grep Root | cut -c 18-) releasedir := releases +repo_srv := root@ulysses +repo_dir := /var/www/repos/lattica webroot := ../website/WebContent/ MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt doc/safekeep.backup.txt DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5 doc/safekeep.backup.5 @@ -35,6 +37,7 @@ @echo " dist Builds release source distribution" @echo " distdeb Builds release binary and source DEBs" @echo " distrpm Buidls release binary and source RPMs" + @echo " deploy Deployes the release RPMs to Lattica's repos" @echo " check Invokes a quick local test for SafeKeep" @echo " test Invokes a comprehensive remote test for SafeKeep" @echo " clean Cleans up the source tree" @@ -131,6 +134,10 @@ mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm ${releasedir} rpm --addsign ${releasedir}/$(releasename)-$(release)*.src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm +deploy: + scp ${releasedir}/${name}{,-common,-client,-server}-${version}-*.rpm ${repo_srv}:${repo_dir}/upload + ssh ${repo_srv} "cd ${repo_dir}; ./deploy-rpms.sh upload/${name}-*${version}-*.rpm" + check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-10-19 17:17:39
|
Revision: 557 http://safekeep.svn.sourceforge.net/safekeep/?rev=557&view=rev Author: dimi Date: 2007-10-19 10:17:38 -0700 (Fri, 19 Oct 2007) Log Message: ----------- Automate SF uploading too. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-10-19 17:10:27 UTC (rev 556) +++ safekeep/trunk/Makefile 2007-10-19 17:17:38 UTC (rev 557) @@ -56,6 +56,8 @@ release: check-info commit-release dist distrpm +deploy: deploy-lattica deploy-sf + commit-release: svn ci -m "Release $(version) (tagged as $(tagname))" @@ -134,10 +136,13 @@ mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm ${releasedir} rpm --addsign ${releasedir}/$(releasename)-$(release)*.src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm -deploy: +deploy-lattica: scp ${releasedir}/${name}{,-common,-client,-server}-${version}-*.rpm ${repo_srv}:${repo_dir}/upload ssh ${repo_srv} "cd ${repo_dir}; ./deploy-rpms.sh upload/${name}-*${version}-*.rpm" +deploy-sf: + lftp -e "mput $(shell ls releases/${name}{,-common,-client,-server}-${version}-*.rpm); quit" upload.sourceforge.net/incoming + check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-10-19 17:24:39
|
Revision: 558 http://safekeep.svn.sourceforge.net/safekeep/?rev=558&view=rev Author: dimi Date: 2007-10-19 10:24:37 -0700 (Fri, 19 Oct 2007) Log Message: ----------- We have to upload the tarball too to SF. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-10-19 17:17:38 UTC (rev 557) +++ safekeep/trunk/Makefile 2007-10-19 17:24:37 UTC (rev 558) @@ -141,7 +141,7 @@ ssh ${repo_srv} "cd ${repo_dir}; ./deploy-rpms.sh upload/${name}-*${version}-*.rpm" deploy-sf: - lftp -e "mput $(shell ls releases/${name}{,-common,-client,-server}-${version}-*.rpm); quit" upload.sourceforge.net/incoming + lftp -e "mput $(shell ls releases/${name}{-${version}.tar.gz,{,-common,-client,-server}-${version}-*.rpm}); quit" upload.sourceforge.net/incoming check: safekeep-test --local This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2007-11-07 14:54:59
|
Revision: 568 http://safekeep.svn.sourceforge.net/safekeep/?rev=568&view=rev Author: dimi Date: 2007-11-07 06:54:57 -0800 (Wed, 07 Nov 2007) Log Message: ----------- Make uses $() not ${} Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2007-11-07 14:52:08 UTC (rev 567) +++ safekeep/trunk/Makefile 2007-11-07 14:54:57 UTC (rev 568) @@ -121,23 +121,23 @@ svn export $(svnroot)/safekeep/tags/$(tagname) $(releasename) cat $(releasename)/$(name).spec.in | sed 's/^%define version.*/%define version $(version)/' > $(releasename)/$(name).spec cat $(releasename)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version)) unstable; urgency=low/' > $(releasename)/debian/changelog - mkdir -p ${releasedir}; tar cz -f ${releasedir}/$(releasename).tar.gz $(releasename) + mkdir -p $(releasedir); tar cz -f $(releasedir)/$(releasename).tar.gz $(releasename) rm -rf $(releasename) distdeb: dist - tar xz -C /tmp -f ${releasedir}/$(releasename).tar.gz - rm -rf ${releasedir}/$(releasename).tar.gz + tar xz -C /tmp -f $(releasedir)/$(releasename).tar.gz + rm -rf $(releasedir)/$(releasename).tar.gz cd /tmp/$(releasename) && debuild --check-dirname-regex 'safekeep(-.*)?' - mv /tmp/$(releasename)/safekeep*deb ${releasedir} + mv /tmp/$(releasename)/safekeep*deb $(releasedir) distrpm: dist - rpmbuild -ta ${releasedir}/$(releasename).tar.gz - mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm ${releasedir} - mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm ${releasedir} - rpm --addsign ${releasedir}/$(releasename)-$(release)*.src.rpm ${releasedir}/$(name)-*-$(version)-$(release)*.noarch.rpm + rpmbuild -ta $(releasedir)/$(releasename).tar.gz + mv $(rpmroot)/SRPMS/$(releasename)-$(release)*.src.rpm $(releasedir) + mv $(rpmroot)/RPMS/noarch/$(name)-*-$(version)-$(release)*.noarch.rpm $(releasedir) + rpm --addsign $(releasedir)/$(releasename)-$(release)*.src.rpm $(releasedir)/$(name)-*-$(version)-$(release)*.noarch.rpm deploy-lattica: - scp ${releasedir}/${name}{,-common,-client,-server}-${version}-*.rpm ${repo_srv}:${repo_dir}/upload + scp $(releasedir)/${name}{,-common,-client,-server}-${version}-*.rpm ${repo_srv}:${repo_dir}/upload ssh ${repo_srv} "cd ${repo_dir}; ./deploy-rpms.sh upload/${name}-*${version}-*.rpm" deploy-sf: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-02-25 01:03:28
|
Revision: 578 http://safekeep.svn.sourceforge.net/safekeep/?rev=578&view=rev Author: dimi Date: 2008-02-24 17:03:26 -0800 (Sun, 24 Feb 2008) Log Message: ----------- Build docs for build. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2008-02-25 00:57:47 UTC (rev 577) +++ safekeep/trunk/Makefile 2008-02-25 01:03:26 UTC (rev 578) @@ -52,7 +52,7 @@ @echo "SVN Root = $(svnroot)" -build: +build: docs release: check-info commit-release dist distrpm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-03-01 22:34:42
|
Revision: 591 http://safekeep.svn.sourceforge.net/safekeep/?rev=591&view=rev Author: dimi Date: 2008-03-01 14:34:36 -0800 (Sat, 01 Mar 2008) Log Message: ----------- We don't need to rebuild docs at install time, we do that at release time now. Modified Paths: -------------- safekeep/trunk/Makefile Modified: safekeep/trunk/Makefile =================================================================== --- safekeep/trunk/Makefile 2008-02-26 21:33:07 UTC (rev 590) +++ safekeep/trunk/Makefile 2008-03-01 22:34:36 UTC (rev 591) @@ -92,7 +92,7 @@ changelog: svn log -v --xml | svn2log.py -D 0 -u doc/users -install: $(DOC_MAN) +install: install -m 755 safekeep "/usr/bin/" install -d -m 755 "/etc/safekeep/backup.d/" install -m 755 safekeep.conf "/etc/safekeep/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |