max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

working on windwos dist

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9620 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-05-08 21:35:16 +00:00
parent e73aa3ac73
commit 81ffd3158e
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Makefile
View File

@ -10,9 +10,11 @@ REL := $(shell svn st -v ../configure.ac | cut -b 10- | ( read one two ; echo $$
TARBALL := $(NAME)-$(VER)-$(REL).tar.gz TARBALL := $(NAME)-$(VER)-$(REL).tar.gz
ZIPBALL := $(NAME)-$(VER)-$(REL).zip
REPOS_PATH ?= trunk REPOS_PATH ?= trunk
all : $(TARBALL) all : $(TARBALL) $(ZIPBALL)
$(TARBALL) : dist.sh $(TARBALL) : dist.sh
ifeq ($(DATE),) ifeq ($(DATE),)
@ -25,6 +27,11 @@ endif
@rm -f $(TARBALL) @rm -f $(TARBALL)
time ./dist.sh -v $(VER) -r $(REL) -d $(DATE) -pr $(REPOS_PATH) 2>&1 | tee dist-$(REL).log 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: usage:
@echo "" @echo ""
@echo "usage: make DATE=<m/d/yyyy> VER=<x.y.z> [REL=x]" @echo "usage: make DATE=<m/d/yyyy> VER=<x.y.z> [REL=x]"

22
packages/configure/Makefile
View File

@ -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 CONF_PKG := $(LNAME)-$(VER)-$(REL).tar.gz
CMAKE_PKG := $(LNAME)-$(VER)-$(REL).zip
TARBALL := $(NAME)-$(VER)-$(REL).tar.gz TARBALL := $(NAME)-$(VER)-$(REL).tar.gz
ZIPBALL := $(NAME)-$(VER)-$(REL).zip
REPOS_PATH ?= trunk REPOS_PATH ?= trunk
all : $(CONF_PKG) all : $(CONF_PKG) $(CMAKE_PKG)
@echo "DATE=$(DATE)" >> history @echo "DATE=$(DATE)" >> history
@echo "VER=$(VER)" >> history @echo "VER=$(VER)" >> history
@echo "REL=$(REL)" >> history @echo "REL=$(REL)" >> history
@ -43,6 +47,22 @@ $(CONF_PKG) : ../$(TARBALL)
mv $(NAME)-$(VER)-$(REL)/_build/$(CONF_PKG) . mv $(NAME)-$(VER)-$(REL)/_build/$(CONF_PKG) .
rm -rf $(NAME)-$(VER)-$(REL) 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: usage:
@echo "" @echo ""
@echo "usage: make DATE=<m/d/yyyy> VER=<x.y.z> [REL=x]" @echo "usage: make DATE=<m/d/yyyy> VER=<x.y.z> [REL=x]"