diff --git a/packages/Makefile b/packages/Makefile index 68b979fd..45c2ae2f 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -10,9 +10,11 @@ REL := $(shell svn st -v ../configure.ac | cut -b 10- | ( read one two ; echo $$ TARBALL := $(NAME)-$(VER)-$(REL).tar.gz +ZIPBALL := $(NAME)-$(VER)-$(REL).zip + REPOS_PATH ?= trunk -all : $(TARBALL) +all : $(TARBALL) $(ZIPBALL) $(TARBALL) : dist.sh ifeq ($(DATE),) @@ -25,6 +27,11 @@ endif @rm -f $(TARBALL) time ./dist.sh -v $(VER) -r $(REL) -d $(DATE) -pr $(REPOS_PATH) 2>&1 | tee dist-$(REL).log +$(ZIPBALL) : $(TARBALL) + @echo "Creating $(ZIPBALL)" + @rm -f $(ZIPBALL) + time ./dist.sh -v $(VER) -r $(REL) -d $(DATE) -pr $(REPOS_PATH) -win 2>&1 | tee distw-$(REL).log + usage: @echo "" @echo "usage: make DATE= VER= [REL=x]" diff --git a/packages/configure/Makefile b/packages/configure/Makefile index 580d1c98..be5e661a 100644 --- a/packages/configure/Makefile +++ b/packages/configure/Makefile @@ -20,13 +20,17 @@ REL := $(shell svn st -v ../../configure.ac | cut -b 10- | ( read one two ; echo CONF_PKG := $(LNAME)-$(VER)-$(REL).tar.gz +CMAKE_PKG := $(LNAME)-$(VER)-$(REL).zip + TARBALL := $(NAME)-$(VER)-$(REL).tar.gz +ZIPBALL := $(NAME)-$(VER)-$(REL).zip + REPOS_PATH ?= trunk -all : $(CONF_PKG) +all : $(CONF_PKG) $(CMAKE_PKG) @echo "DATE=$(DATE)" >> history @echo "VER=$(VER)" >> history @echo "REL=$(REL)" >> history @@ -43,6 +47,22 @@ $(CONF_PKG) : ../$(TARBALL) mv $(NAME)-$(VER)-$(REL)/_build/$(CONF_PKG) . rm -rf $(NAME)-$(VER)-$(REL) +$(CMAKE_PKG) : ../$(ZIPBALL) $(CONF_PKG) + rm -rf $(NAME)-$(VER)-$(REL) + unzip ../$(ZIPBALL) + cd $(NAME)-$(VER)-$(REL) && autoreconf -fvi + cd $(NAME)-$(VER)-$(REL) && mkdir _build + cd $(NAME)-$(VER)-$(REL) && cd _build && ../configure + cd $(NAME)-$(VER)-$(REL) && cd _build && $(MAKE) dist-zip + mv $(NAME)-$(VER)-$(REL)/_build/$(CONF_PKG) . + rm -rf $(NAME)-$(VER)-$(REL) + + +../$(TARBALL) : + cd .. && $(MAKE) DATE=$(DATE) VER=$(VER) REL=$(REL) + +../$(ZIPBALL) : ../$(TARBALL) + usage: @echo "" @echo "usage: make DATE= VER= [REL=x]"