From 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 21 Nov 2009 03:56:59 +0000 Subject: Add Makefile to build Win32 packages. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1736 --- pkg/win32/GNUmakefile.am | 34 ++++++++++++++++++++++++++++++++++ pkg/win32/README | 4 ++++ 2 files changed, 38 insertions(+) create mode 100644 pkg/win32/GNUmakefile.am create mode 100644 pkg/win32/README (limited to 'pkg/win32') diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am new file mode 100644 index 00000000..edd57b6e --- /dev/null +++ b/pkg/win32/GNUmakefile.am @@ -0,0 +1,34 @@ + +TOPLEVEL=../.. + +EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe \ + $(TOPLEVEL)/src/chocolate-server.exe \ + $(TOPLEVEL)/setup/chocolate-setup.exe + +DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ + $(TOPLEVEL)/src/SDL_mixer.dll \ + $(TOPLEVEL)/src/SDL_net.dll + +DOC_FILES=README \ + COPYING \ + ChangeLog \ + NEWS \ + BUGS \ + CMDLINE \ + TODO + +noinst_DATA=@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip + +@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip : staging + zip -j -r $@ staging/ + +staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) + rm -rf staging + mkdir staging + cp $(EXE_FILES) $(DLL_FILES) staging/ + $(STRIP) staging/*.exe + for f in $(DOC_FILES); do \ + cp $(TOPLEVEL)/$$f staging/$$f.txt; \ + unix2dos staging/$$f.txt; \ + done + diff --git a/pkg/win32/README b/pkg/win32/README new file mode 100644 index 00000000..1f43f52c --- /dev/null +++ b/pkg/win32/README @@ -0,0 +1,4 @@ + +Makefile to build Windows packages. Requires zip and unix2dos cygwin +packages to be installed. + -- cgit v1.2.3 From d27d3bb8b68f1e0f066a0749601ff32431325983 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 29 Nov 2009 22:50:17 +0000 Subject: Add other missing files to dist. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1743 --- pkg/win32/GNUmakefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg/win32') diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am index edd57b6e..ed86d2cc 100644 --- a/pkg/win32/GNUmakefile.am +++ b/pkg/win32/GNUmakefile.am @@ -17,6 +17,7 @@ DOC_FILES=README \ CMDLINE \ TODO +EXTRA_DIST=README noinst_DATA=@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip @PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip : staging -- cgit v1.2.3 From 860a17497bdc189f78f5a0bca000a0451d5ae624 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 5 Jan 2010 15:52:12 +0000 Subject: Move config.make up to pkg/ directory. Use static makefiles to generate all packages, rather than dynamically generated makefiles. Add pkg/osx to dist. Make OS X staging directory depend on top level documentation files. Generate CMDLINE as part of standard build if it is not already present. Set svn:ignore properties. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1790 --- pkg/win32/GNUmakefile | 26 ++++++++++++++++++++++++++ pkg/win32/GNUmakefile.am | 35 ----------------------------------- 2 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 pkg/win32/GNUmakefile delete mode 100644 pkg/win32/GNUmakefile.am (limited to 'pkg/win32') diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile new file mode 100644 index 00000000..93c6abe1 --- /dev/null +++ b/pkg/win32/GNUmakefile @@ -0,0 +1,26 @@ + +include ../config.make + +TOPLEVEL=../.. + +EXE_FILES=$(TOPLEVEL)/src/$(PACKAGE_TARNAME).exe \ + $(TOPLEVEL)/src/chocolate-server.exe \ + $(TOPLEVEL)/setup/chocolate-setup.exe + +DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ + $(TOPLEVEL)/src/SDL_mixer.dll \ + $(TOPLEVEL)/src/SDL_net.dll + +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip : staging + zip -j -r $@ staging/ + +staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) + rm -rf staging + mkdir staging + cp $(EXE_FILES) $(DLL_FILES) staging/ + $(STRIP) staging/*.exe + for f in $(DOC_FILES); do \ + cp $(TOPLEVEL)/$$f staging/$$f.txt; \ + unix2dos staging/$$f.txt; \ + done + diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile.am deleted file mode 100644 index ed86d2cc..00000000 --- a/pkg/win32/GNUmakefile.am +++ /dev/null @@ -1,35 +0,0 @@ - -TOPLEVEL=../.. - -EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe \ - $(TOPLEVEL)/src/chocolate-server.exe \ - $(TOPLEVEL)/setup/chocolate-setup.exe - -DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ - $(TOPLEVEL)/src/SDL_mixer.dll \ - $(TOPLEVEL)/src/SDL_net.dll - -DOC_FILES=README \ - COPYING \ - ChangeLog \ - NEWS \ - BUGS \ - CMDLINE \ - TODO - -EXTRA_DIST=README -noinst_DATA=@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip - -@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip : staging - zip -j -r $@ staging/ - -staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) - rm -rf staging - mkdir staging - cp $(EXE_FILES) $(DLL_FILES) staging/ - $(STRIP) staging/*.exe - for f in $(DOC_FILES); do \ - cp $(TOPLEVEL)/$$f staging/$$f.txt; \ - unix2dos staging/$$f.txt; \ - done - -- cgit v1.2.3 From 6fb7afc47cb78584d19ccb10284dd20243b06540 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 5 Jan 2010 17:20:58 +0000 Subject: Add "clean" target to package makefiles. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1791 --- pkg/win32/GNUmakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkg/win32') diff --git a/pkg/win32/GNUmakefile b/pkg/win32/GNUmakefile index 93c6abe1..626f1845 100644 --- a/pkg/win32/GNUmakefile +++ b/pkg/win32/GNUmakefile @@ -11,7 +11,9 @@ DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ $(TOPLEVEL)/src/SDL_mixer.dll \ $(TOPLEVEL)/src/SDL_net.dll -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip : staging +ZIP=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip + +$(ZIP) : staging zip -j -r $@ staging/ staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) @@ -24,3 +26,7 @@ staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) unix2dos staging/$$f.txt; \ done +clean: + rm -f $(ZIP) + rm -rf staging + -- cgit v1.2.3