[csw-devel] SF.net SVN: gar:[2857] csw/mgar/gar

[trygvis at users.sourceforge.net]

Revision: 2857
          http://gar.svn.sourceforge.net/gar/?rev=2857&view=rev
Author:   trygvis
Date:     2009-01-18 21:08:22 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
o Adding scm-help stuff to v1 as well.

Modified Paths:
--------------
    csw/mgar/gar/v1/gar.conf.mk
    csw/mgar/gar/v2/scm-help

Added Paths:
-----------
    csw/mgar/gar/v1/bin/svnignore
    csw/mgar/gar/v1/gar.svn.mk
    csw/mgar/gar/v1/scm-help

Copied: csw/mgar/gar/v1/bin/svnignore (from rev 2683, csw/mgar/gar/v2/bin/svnignore)
===================================================================
--- csw/mgar/gar/v1/bin/svnignore	                        (rev 0)
+++ csw/mgar/gar/v1/bin/svnignore	2009-01-18 21:08:22 UTC (rev 2857)
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright 2008-2009 OpenCSW
+#
+# Redistribution and/or use, with or without modification, is
+# permitted. This software is without warranty of any kind. The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#
+# gar.svn.mk - Targets for working with svn
+
+# Read the comma separated ignores from stdin and merges it with any existing 
+# ignores set on the directory.
+
+ignores=`mktemp`-ignores
+existing_ignores=`mktemp`-existing
+new_ignores=`mktemp`-new
+
+while [ "$1" != "" ]; do
+  echo $1 >> $ignores
+  shift
+done
+
+svn pg svn:ignore . > $existing_ignores
+cat $ignores $existing_ignores | sort | uniq > $new_ignores
+svn ps svn:ignore . -F $new_ignores
+
+rm -rf $ignores $existing_ignores $new_ignores

Modified: csw/mgar/gar/v1/gar.conf.mk
===================================================================
--- csw/mgar/gar/v1/gar.conf.mk	2009-01-18 20:59:05 UTC (rev 2856)
+++ csw/mgar/gar/v1/gar.conf.mk	2009-01-18 21:08:22 UTC (rev 2857)
@@ -303,5 +303,4 @@
 FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/)
 
 # Extra libraries
-EXTRA_LIBS = gar.pkg.mk gar.common.mk
-
+EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk

Copied: csw/mgar/gar/v1/gar.svn.mk (from rev 2683, csw/mgar/gar/v2/gar.svn.mk)
===================================================================
--- csw/mgar/gar/v1/gar.svn.mk	                        (rev 0)
+++ csw/mgar/gar/v1/gar.svn.mk	2009-01-18 21:08:22 UTC (rev 2857)
@@ -0,0 +1,29 @@
+# vim: ft=make ts=4 sw=4 noet
+#
+# $Id$
+#
+# Copyright 2008-2009 OpenCSW
+#
+# Redistribution and/or use, with or without modification, is
+# permitted. This software is without warranty of any kind. The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#
+# gar.svn.mk - Targets for working with svn
+#
+
+scm-help:
+	@cat $(GARDIR)/scm-help
+
+scm-update-all: scm-update-package scm-update-gar
+
+scm-update-package:
+	$(SVN) --ignore-externals up
+
+scm-update-gar:
+	cd $(GARDIR) && $(SVN) --ignore-externals up
+
+scm-update-ignores:
+	$(GARDIR)/bin/svnignore work cookies download
+
+.PHONY: scm-help scm-update-all scm-update-package scm-update-gar

Copied: csw/mgar/gar/v1/scm-help (from rev 2683, csw/mgar/gar/v2/scm-help)
===================================================================
--- csw/mgar/gar/v1/scm-help	                        (rev 0)
+++ csw/mgar/gar/v1/scm-help	2009-01-18 21:08:22 UTC (rev 2857)
@@ -0,0 +1,12 @@
+These are the available SCM targets
+
+scm-update-package:
+  Updates the package files
+
+scm-update-all:
+  Updates both the package files and the gar/ directory
+
+scm-update-gar:
+  Updates the contents of the gar/ directory
+
+  This should only be used inside a package directory

Modified: csw/mgar/gar/v2/scm-help
===================================================================
--- csw/mgar/gar/v2/scm-help	2009-01-18 20:59:05 UTC (rev 2856)
+++ csw/mgar/gar/v2/scm-help	2009-01-18 21:08:22 UTC (rev 2857)
@@ -1,10 +1,12 @@
 These are the available SCM targets
 
+scm-update-package:
+  Updates the package files
+
 scm-update-all:
   Updates both the package files and the gar/ directory
 
-scm-update-package:
-  Updates the package files
-
 scm-update-gar:
   Updates the contents of the gar/ directory
+
+  This should only be used inside a package directory


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