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

[bdwalton at users.sourceforge.net]

Revision: 14152
          http://gar.svn.sourceforge.net/gar/?rev=14152&view=rev
Author:   bdwalton
Date:     2011-04-12 23:50:54 +0000 (Tue, 12 Apr 2011)

Log Message:
-----------
cswutils/trunk: depend on rsync at build time; rework where we get the .py files from and how they get installed

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

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2011-04-12 19:14:42 UTC (rev 14151)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2011-04-12 23:50:54 UTC (rev 14152)
@@ -9,50 +9,22 @@
 endef
 
 SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/
-SVN_REV = 133
+SVN_REV = 364
 
 SVNROOT_gar = https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/
 SVN_REV_gar = HEAD
 
 MASTER_SITES =
 
-# these are pulled from gar/lib/python
-PYFILES += catalog.py
-PYFILES += checkpkg.py
-PYFILES += checkpkg2.py
-PYFILES += checkpkg_lib.py
-PYFILES += common_constants.py
-PYFILES += compare_pkgs.py
-PYFILES += configuration.py
-PYFILES += database.py
-PYFILES += dependency_checks.py
-PYFILES += inspective_package.py
-PYFILES += ldd_emul.py
-PYFILES += models.py
-PYFILES += mute_progressbar.py
-PYFILES += opencsw.py
-PYFILES += overrides.py
-PYFILES += package.py
-PYFILES += package_checks.py
-PYFILES += package_stats.py
-PYFILES += pkgdb.py
-PYFILES += pkgmap.py
-PYFILES += pylintrc
-PYFILES += sharedlib_utils.py
-PYFILES += shell.py
-PYFILES += struct_util.py
-PYFILES += submit_to_newpkgs.py
-PYFILES += system_pkgmap.py
-PYFILES += tag.py
-
 DISTFILES = COPYING
 DISTFILES += checkpkg checkpkg.8
 DISTFILES += cpan2pkg
 DISTFILES += createpkg createpkg.8
 DISTFILES += stagepkg stagepkg.8
 DISTFILES += stagepkg stagepkg.8
-DISTFILES += $(PYFILES)
 
+BUILD_DEP_PKGS = CSWrsync
+
 RUNTIME_DEP_PKGS += CSWcoreutils
 RUNTIME_DEP_PKGS += CSWfakeroot
 RUNTIME_DEP_PKGS += CSWperl
@@ -81,12 +53,6 @@
 
 include gar/category.mk
 
-$(foreach PY,$(PYFILES),$(DOWNLOADDIR)/$(PY)):
-	@echo "Grabbing $@"
-	@svn export -r $(SVN_REV_gar) $(SVNROOT_gar)$(subst -r$(SVN_REV_gar),,$(notdir $@))
-	@mv $(subst -r$(SVN_REV_gar),,$(notdir $@)) $@
-	@$(MAKECOOKIE)
-
 install-custom:
 	@ginstall -d $(DESTDIR)$(bindir)
 	@ginstall $(WORKSRC)/checkpkg $(DESTDIR)$(bindir)
@@ -99,10 +65,10 @@
 	@ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/
 	@ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/
 	@ginstall -d $(DESTDIR)$(libdir)/python/csw
-	@for f in $(PYFILES); do \
-		ginstall -m 755 $(WORKSRC)/$${f} \
-			$(DESTDIR)/$(libdir)/python/csw/; \
-	done
-	@ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg
-	@ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg
+	@rsync -av --exclude=.svn/ --exclude='*.pyc' $(GARDIR)/lib/python/ \
+		$(DESTDIR)/$(libdir)/python/csw/
+	@ln -s ../lib/python/csw/compare_pkgs.py \
+		$(DESTDIR)$(bindir)/comparepkg
+	@ln -s ../lib/python/csw/submit_to_newpkgs.py \
+		$(DESTDIR)$(bindir)/submitpkg
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2011-04-12 19:14:42 UTC (rev 14151)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2011-04-12 23:50:54 UTC (rev 14152)
@@ -1,27 +0,0 @@
-4b5ef28c5a8fb45f60d57d5a12bc31b5  catalog.py
-e2150c4ad6bbb5545a3ddc23eccea8d9  checkpkg.py
-03c7384869e75284b0df6803df62b68f  checkpkg2.py
-7181db66ceb6929dd540ada837f1b4cf  checkpkg_lib.py
-b7ed7604e92d375b421f69a17fbf27cd  common_constants.py
-70200cc5eb2c87a1b1aaf6efa6ffd2bc  compare_pkgs.py
-f4789eb3717cd52ea84eb5ce53040643  configuration.py
-10b999d9f9b2c5e380edba9ab2302188  database.py
-d6fe04aa4349dfd980d053ce7b2210eb  dependency_checks.py
-7bfe4469e93caa02064ae63d65435cf9  inspective_package.py
-ae8f0f606838bbc14670e145bcc7442d  ldd_emul.py
-1f7e98eb1b2166f89992f67d0a92f183  models.py
-5ab798ae3fe3a2e10c1d2aa9e4a31594  mute_progressbar.py
-283779d73a88aca3d3fa203b38d4c0d8  opencsw.py
-614dca976de7a563a587e6fd5b585629  overrides.py
-fa476d0cec5adbac1091192a6aefe8b3  package.py
-e3737793a23b1955b1f369c9a030c117  package_checks.py
-f9bde429846be3d98f9e4af11a36672e  package_stats.py
-ad38d99678db4d758e3e7a9265adcfdf  pkgdb.py
-fa5c633db8dbd1da61d12e4a858720c4  pkgmap.py
-0dc3c750ee9f5c0286c2e292b2e27086  pylintrc
-519169afa0be666d05cbfa94fce1a205  sharedlib_utils.py
-000b4eacb602a91e02dcdcfc0858c42c  shell.py
-de09f38d0c145c572a4e44ab17bb02ef  struct_util.py
-2fb7af0c40fa5da3ee034014ae5b9855  submit_to_newpkgs.py
-64d86b86a7d5a65d6685aa60aa0d5aec  system_pkgmap.py
-60a9a1281f9ab455c5fa90c084f05d64  tag.py


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