KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated post r19769, integrates the missing dl_method bzr hunk from #6370, uses the export subcommand for the vcs' that provide a usable version (hg archive doesn't work remotely, git archive isn't enabled on github), from #6700

Browse source 
SVN-Revision: 20222
This commit is contained in:
Travis Kemen 2010-03-14 21:55:11 +00:00
parent 1223494f1d
commit db7082d899
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/download.mk
View file

@ -16,7 +16,9 @@ $(strip \
$(if $(filter svn://%,$(1)),svn, \ $(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \ $(if $(filter cvs://%,$(1)),cvs, \
$(if $(filter hg://%,$(1)),hg, \ $(if $(filter hg://%,$(1)),hg, \
unknown \ $(if $(filter sftp://%,$(1)),bzr, \
unknown \
) \
) \ ) \
) \ ) \
) \ ) \
@ -53,11 +55,11 @@ define DownloadMethod/cvs
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
cvs -d $(URL) co $(VERSION) $(SUBDIR) && \ cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
find $(SUBDIR) -name CVS | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \
) )
endef endef
@ -68,11 +70,11 @@ define DownloadMethod/svn
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
svn co --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \ svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
find $(SUBDIR) -name .svn | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \
) )
endef endef
@ -88,7 +90,8 @@ define DownloadMethod/git
echo "Packing checkout..." && \ echo "Packing checkout..." && \
rm -rf $(SUBDIR)/.git && \ rm -rf $(SUBDIR)/.git && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \
) )
endef endef
@ -99,11 +102,11 @@ define DownloadMethod/bzr
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) && \ bzr export -r$(VERSION) $(URL) $(SUBDIR) && \
find $(SUBDIR) -name .bzr | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ &&
rm -rf $(SUBDIR); \
) )
endef endef
@ -118,7 +121,8 @@ define DownloadMethod/hg
find $(SUBDIR) -name .hg | xargs rm -rf && \ find $(SUBDIR) -name .hg | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
rm -rf $(SUBDIR); \
) )
endef endef