gunnar: server/make-helper horde-snapshot.mk, 1.2, 1.3 pear.mk, 1.10, 1.11
cvs at kolab.org
cvs at kolab.org
Sun Mar 7 22:26:25 CET 2010
Author: gunnar
Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv12650/make-helper
Modified Files:
horde-snapshot.mk pear.mk
Log Message:
Updating the repository may fail. Add a local snapshot target that does not upload to files.kolab.org for testing purposes.
Index: horde-snapshot.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/horde-snapshot.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-snapshot.mk 18 Feb 2010 10:06:53 -0000 1.2
+++ horde-snapshot.mk 7 Mar 2010 21:26:23 -0000 1.3
@@ -23,7 +23,8 @@
mkdir -p "$(UPSTREAM)/$(SAFE_COMMIT)"
$(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(GIT_PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)
- cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD) && $(GIT_REPO_SC_CMD) "$(SAFE_COMMIT)"
+ -cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD)
+ cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_SC_CMD) "$(SAFE_COMMIT)"
tmp/$(SOURCE_PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(GIT_PACKAGE)
rm -rf tmp
@@ -42,3 +43,8 @@
# Short name for uploading the snapshot.
.PHONY:snapshot
snapshot: tmp/.sent
+
+# Short name for uploading the snapshot.
+.PHONY:snapshot-local
+snapshot-local: tmp/$(SOURCE_0)
+ cp tmp/$(SOURCE_0) $(SOURCE_0)
Index: pear.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/pear.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pear.mk 18 Feb 2010 10:06:53 -0000 1.10
+++ pear.mk 7 Mar 2010 21:26:23 -0000 1.11
@@ -162,7 +162,8 @@
cd "$(UPSTREAM)" && $(GIT_REPO_CO_CMD) $(GIT_REPO_URL)
$(UPSTREAM)/.$(GIT_REPO)-commit_$(COMMIT): $(UPSTREAM)/$(GIT_REPO)
- cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD) && $(GIT_REPO_SC_CMD) "$(COMMIT)"
+ -cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD)
+ cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_SC_CMD) "$(COMMIT)"
rm -f $(UPSTREAM)/.$(GIT_REPO)-commit_*
touch $@
endif
@@ -208,6 +209,11 @@
.PHONY:snapshot
snapshot: tmp/.sent
endif
+
+# Short name for uploading the snapshot.
+.PHONY:snapshot-local
+snapshot-local: tmp/$(SOURCE_0)
+ cp tmp/$(SOURCE_0) $(SOURCE_0)
# Prepare the patch for the package.
package.patch: $(PATCHES)
More information about the commits
mailing list