jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move config.make up to pkg/ directory. Use static makefiles to generate

Browse source 
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
This commit is contained in:
Simon Howard 2010-01-05 15:52:12 +00:00
parent 37325bbfc1
commit 860a17497b
11 changed files with 77 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -53,6 +53,8 @@ DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_PYTHON
noinst_DATA=CMDLINE
CMDLINE : src/
./man/docgen -p man/CMDLINE.template src/ > $@

4
configure.in
View file

@ -123,9 +123,7 @@ man/Makefile
src/Makefile
pcsound/Makefile
pkg/Makefile
pkg/wince/GNUmakefile
pkg/win32/GNUmakefile
pkg/osx/config.make
pkg/config.make
pkg/osx/Info.plist
src/resource.rc
src/doom-screensaver.desktop

3
pkg/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
Makefile
Makefile.in
config.make

28
pkg/Makefile.am
View file

@ -1,3 +1,29 @@
DIST_SUBDIRS=wince win32
OSX_FILES= \
osx/app-skeleton/Contents/PkgInfo \
osx/app-skeleton/Contents/Resources/128x128.png \
osx/app-skeleton/Contents/Resources/app.icns \
osx/app-skeleton/Contents/Resources/launcher.nib/classes.nib \
osx/app-skeleton/Contents/Resources/launcher.nib/info.nib \
osx/app-skeleton/Contents/Resources/launcher.nib/keyedobjects.nib \
osx/GNUmakefile \
osx/Info.plist.in \
osx/cp-with-libs \
osx/main.m \
osx/AppController.m osx/AppController.h \
osx/Execute.m osx/Execute.h \
osx/IWADController.m osx/IWADController.h \
osx/IWADLocation.m osx/IWADLocation.h \
osx/LauncherManager.m osx/LauncherManager.h
WINCE_FILES= \
wince/GNUmakefile \
wince/wince-cab.cfg \
wince/wince-cabgen
WIN32_FILES= \
win32/GNUmakefile \
win32/README
EXTRA_DIST=$(OSX_FILES) $(WINCE_FILES) $(WIN32_FILES)

19
pkg/config.make.in Normal file
View file

@ -0,0 +1,19 @@
# File included by package makefiles that contains details
# about the package name, generated by configure.
PACKAGE = @PACKAGE@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
# Documentation files to distribute with packages.
DOC_FILES=README \
COPYING \
ChangeLog \
NEWS \
BUGS \
CMDLINE \
TODO

5
pkg/osx/.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
Info.plist
launcher
*.o
*.d
staging

24
pkg/osx/GNUmakefile
View file

@ -1,19 +1,14 @@
include config.make
include ../config.make
CC=gcc
STRIP=strip
STAGING_DIR=staging
DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg
DOC_FILES=\
README \
COPYING \
ChangeLog \
NEWS \
BUGS \
CMDLINE \
TODO
TOPLEVEL=../..
TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
ifndef GNUSTEP_MAKEFILES
@ -30,20 +25,21 @@ endif
APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app
APP_BIN_DIR=$(APP_DIR)/Contents/MacOS/
$(STAGING_DIR): launcher
$(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
rm -rf $(STAGING_DIR)
mkdir $(STAGING_DIR)
cp -R app-skeleton "$(APP_DIR)"
mkdir "$(APP_BIN_DIR)"
cp Info.plist "$(APP_DIR)/Contents/"
cp launcher "$(APP_BIN_DIR)/"
./cp-with-libs ../../src/chocolate-doom "$(APP_BIN_DIR)"
./cp-with-libs $(TOPLEVEL)/src/chocolate-doom "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/chocolate-doom"
./cp-with-libs ../../setup/chocolate-setup "$(APP_BIN_DIR)"
./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)"
$(STRIP) "$(APP_BIN_DIR)/chocolate-setup"
for d in $(DOC_FILES); do cp ../../$$d $(STAGING_DIR)/; done
for d in $(DOC_FILES); do cp $(TOPLEVEL)/$$d $(STAGING_DIR)/; done
find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true
@ -53,7 +49,7 @@ clean : launcher_clean
# Launcher build:
CFLAGS = -Wall -I../..
CFLAGS = -Wall -I$(TOPLEVEL)
# Are we building using gs_make?

9
pkg/osx/config.make.in
View file

@ -1,9 +0,0 @@
# File included by the main makefile that contains details
# about the package name, generated by configure.
PACKAGE = @PACKAGE@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@

17
pkg/win32/GNUmakefile.am → pkg/win32/GNUmakefile
View file

@ -1,7 +1,9 @@
include ../config.make
TOPLEVEL=../..
EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe \
EXE_FILES=$(TOPLEVEL)/src/$(PACKAGE_TARNAME).exe \
$(TOPLEVEL)/src/chocolate-server.exe \
$(TOPLEVEL)/setup/chocolate-setup.exe
@ -9,18 +11,7 @@ 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
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip : staging
zip -j -r $@ staging/
staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES))

8
pkg/wince/GNUmakefile.am → pkg/wince/GNUmakefile
View file

@ -1,11 +1,9 @@
include ../config.make
DEPS=$(shell ./wince-cabgen -d $(CONFIG_FILE))
CONFIG_FILE=wince-cab.cfg
OUTPUT_FILE=@PACKAGE_TARNAME@-@PACKAGE_VERSION@.cab
EXTRA_DIST=wince-cabgen $(CONFIG_FILE)
noinst_DATA = $(OUTPUT_FILE)
OUTPUT_FILE=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).cab
$(OUTPUT_FILE) : $(CONFIG_FILE) $(DEPS)
./wince-cabgen $< $@

3
wince/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
Makefile
Makefile.in
.deps