gunnar: server/make-helper horde-snapshot.mk, 1.1, 1.2 pear.mk, 1.9, 1.10

cvs at kolab.org cvs at kolab.org
Thu Feb 18 11:06:55 CET 2010


Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv10085/make-helper

Modified Files:
	horde-snapshot.mk pear.mk 
Log Message:
Added the next Horde4 piece: imp. Does work on my test install but there are still some major issues and installation on another system should be close but not yet fully functional.

Index: horde-snapshot.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/horde-snapshot.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-snapshot.mk	9 Feb 2010 10:18:11 -0000	1.1
+++ horde-snapshot.mk	18 Feb 2010 10:06:53 -0000	1.2
@@ -23,13 +23,12 @@
 	mkdir -p "$(UPSTREAM)/$(SAFE_COMMIT)"
 
 $(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(GIT_PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)
-	-cd "$(UPSTREAM)/$(SAFE_COMMIT)" && $(GIT_REPO_CO_CMD) $(GIT_REPO_URL)
-	cd "$(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)" && $(GIT_REPO_SC_CMD) "$(COMMIT)"
+	cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD) && $(GIT_REPO_SC_CMD) "$(SAFE_COMMIT)"
 
 tmp/$(SOURCE_PACKAGE): $(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(GIT_PACKAGE)
 	rm -rf tmp
 	mkdir tmp
-	cp -r "$(UPSTREAM)/$(SAFE_COMMIT)/$(GIT_REPO)/$(GIT_PACKAGE)" tmp/$(SOURCE_PACKAGE)
+	cp -r "$(UPSTREAM)/$(GIT_REPO)/$(GIT_PACKAGE)" tmp/$(SOURCE_PACKAGE)
 
 # Package the source
 tmp/$(SOURCE_0): tmp/$(SOURCE_PACKAGE)

Index: pear.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/pear.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pear.mk	16 Feb 2010 08:17:32 -0000	1.9
+++ pear.mk	18 Feb 2010 10:06:53 -0000	1.10
@@ -162,7 +162,7 @@
 	cd "$(UPSTREAM)" && $(GIT_REPO_CO_CMD) $(GIT_REPO_URL)
 
 $(UPSTREAM)/.$(GIT_REPO)-commit_$(COMMIT): $(UPSTREAM)/$(GIT_REPO)
-	cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_SC_CMD) "$(COMMIT)"
+	cd "$(UPSTREAM)/$(GIT_REPO)" && $(GIT_REPO_UP_CMD) && $(GIT_REPO_SC_CMD) "$(COMMIT)"
 	rm -f $(UPSTREAM)/.$(GIT_REPO)-commit_*
 	touch $@
 endif





More information about the commits mailing list