Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify buildsystem for base.wz/mp.wz and make sure to really regenerate the archives. 

This would not always work before, since we just depend on the directory, not each file in it.
This oversight made make not recognize when a file was changed and the archive needs to be regenerated.
We now run zip on every invocation of the data target.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5158 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-05-23 22:01:07 +00:00
parent 976240b528
commit e7a0a57b0e
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data/Makefile.am
View File

@ -1,26 +1,29 @@
SUBDIRS = mods
stamp:
touch stamp
%.wz: % stamp
(cd $(srcdir)/$< && zip -ru0 $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@
rm -f stamp
BASELIST = anims audio components effects features tagdefinitions \
gamedesc.lev images messages misc multiplay novideo.rpl script \
sequenceaudio stats stats-sql structs texpages wrf
PATCHLIST = addon.lev anims components effects \
messages multiplay stats structs wrf
BASEARCHIVE=base.wz
PATCHARCHIVE=mp.wz
BASEARCHIVE = base.wz
PATCHARCHIVE = mp.wz
CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE)
CLEANFILES = $(BASEARCHIVE) $(PATCHARCHIVE)
data: $(BASEARCHIVE) $(PATCHARCHIVE)
$(MAKE) $(AM_MAKEFLAGS) -C mods data
$(BASEARCHIVE): $(BASELIST:%=base/%)
(cd $(srcdir)/base && zip -ru0 $(abs_builddir)/$@ $(BASELIST) -x *svn*)
zip -T $@
$(PATCHARCHIVE): $(PATCHLIST:%=mp/%)
(cd $(srcdir)/mp && zip -ru0 $(abs_builddir)/$@ $(PATCHLIST) -x *svn*)
zip -T $@
$(BASEARCHIVE): $(BASELIST:%=$(basename $(BASEARCHIVE))/%)
$(PATCHARCHIVE): $(PATCHLIST:%=$(basename $(PATCHARCHIVE))/%)
install-data-local: $(BASEARCHIVE) $(PATCHARCHIVE)
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)

8
data/mods/global/Makefile.am
View File

@ -1,8 +1,12 @@
SUBDIRS = aivolution/multiplay/skirmish
%.wz: %
(cd $(srcdir)/$< && zip -ru0 $(abs_builddir)/$@ $(filter-out $<,$(?:$</%=%)) -x '*svn*')
stamp:
touch stamp
%.wz: % stamp
(cd $(srcdir)/$< && zip -ru0 $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
zip -T $@
rm -f stamp
AIVOLUTIONLIST = multiplay commands.txt
GRIMLIST = components structs texpages wrf COPYING