[csw-devel] SF.net SVN: gar:[21606] csw/mgar/pkg/cswutils/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 21606
          http://gar.svn.sourceforge.net/gar/?rev=21606&view=rev
Author:   wahwah
Date:     2013-08-01 11:33:30 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
cswutils/trunk: Less dependency on GARDIR and random files that might lying around.

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2013-08-01 10:19:16 UTC (rev 21605)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2013-08-01 11:33:30 UTC (rev 21606)
@@ -3,11 +3,9 @@
 NAME = cswutils
 VERSION = 1.$(GARHEAD)
 GARTYPE = v2
-GARHEAD = $(shell cd $(GARDIR); svn info | grep 'Last Changed Rev' | sed 's/[^0-9]*//')
+GARHEAD = $(shell svn info $(SVNROOT_gar) | grep 'Last Changed Rev' | sed 's/[^0-9]*//')
 
 DESCRIPTION = Utilities for CSW maintainers
-define BLURB
-endef
 
 SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/
 SVN_REV = 364
@@ -33,18 +31,15 @@
 RUNTIME_DEP_PKGS += CSWpmlibwww
 RUNTIME_DEP_PKGS += CSWpmyaml
 RUNTIME_DEP_PKGS += CSWpy-cheetah
-RUNTIME_DEP_PKGS += CSWpy-hachoir-core
-RUNTIME_DEP_PKGS += CSWpy-hachoir-parser
 RUNTIME_DEP_PKGS += CSWpy-libmagic
+RUNTIME_DEP_PKGS += CSWpy-pyelftools
 RUNTIME_DEP_PKGS += CSWpy-progressbar
 RUNTIME_DEP_PKGS += CSWpy-sqlobject
 RUNTIME_DEP_PKGS += CSWpy-curl
 RUNTIME_DEP_PKGS += CSWpython
 
-WORKSRC = $(WORKDIR)
-
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
@@ -76,25 +71,30 @@
 
 include gar/category.mk
 
+build-custom:
+	cd $(WORKSRC) && svn export $(SVNROOT_gar) gar-code
+	@$(MAKECOOKIE)
+
 install-custom:
 	@ginstall -d $(DESTDIR)$(bindir)
-	@ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir)/checkpkg.legacy
-	@ginstall $(WORKSRC)/cpan2pkg $(DESTDIR)$(bindir)
-	@ginstall $(WORKSRC)/createpkg $(DESTDIR)$(bindir)
-	@ginstall $(WORKSRC)/stagepkg $(DESTDIR)$(bindir)
+	@ginstall $(WORKDIR)/checkpkg $(DESTDIR)$(bindir)/checkpkg.legacy
+	@ginstall $(WORKDIR)/cpan2pkg $(DESTDIR)$(bindir)
+	@ginstall $(WORKDIR)/createpkg $(DESTDIR)$(bindir)
+	@ginstall $(WORKDIR)/stagepkg $(DESTDIR)$(bindir)
 	@ginstall $(GARDIR)/bin/fixlibtool $(DESTDIR)$(bindir)
 	@ginstall -d $(DESTDIR)$(mandir)/man8
-	@ginstall $(WORKSRC)/checkpkg.8 $(DESTDIR)$(mandir)/man8/
-	@ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/
-	@ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/
+	@ginstall $(WORKDIR)/checkpkg.8 $(DESTDIR)$(mandir)/man8/
+	@ginstall $(WORKDIR)/createpkg.8 $(DESTDIR)$(mandir)/man8/
+	@ginstall $(WORKDIR)/stagepkg.8 $(DESTDIR)$(mandir)/man8/
 	@ginstall -d $(DESTDIR)$(libdir)/python/csw
 	@ginstall -d $(DESTDIR)$(datadir)/opencsw/gar
-	@(cd $(GARDIR); svn info > $(DESTDIR)$(datadir)/opencsw/gar/cswutils.svn_version.txt)
+	@(echo $(GARHEAD) > $(DESTDIR)$(datadir)/opencsw/gar/cswutils.svn_version.txt)
 	@ginstall -m 0644 $(GARDIR)/etc/commondirs* $(DESTDIR)/$(datadir)/opencsw/gar/
-	@rsync -av --exclude=.svn/ --exclude='*.pyc' $(GARDIR)/lib/python/ \
+	@rsync -av \
+		--exclude=testdata/ \
+		--exclude='*.pyc' \
+		$(WORKSRC)/gar-code/ \
 		$(DESTDIR)/$(libdir)/python/csw/
-	@ln -s ../lib/python/csw/compare_pkgs.py \
-		$(DESTDIR)$(bindir)/comparepkg
 	@ln -s ../lib/python/csw/csw_upload_pkg.py \
 		$(DESTDIR)$(bindir)/csw-upload-pkg
 	@ln -s ../lib/python/csw/checkpkg2.py \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.