Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17261) -Fix (r17214): don't forget to package the compatability wrapper scripts

Browse Source
This commit is contained in:
rubidium 2009-08-22 16:07:39 +00:00
parent 290d8a99c3
commit 19c8acb89c
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.bundle.in
View File

@ -29,10 +29,12 @@ endif
# An OSX application bundle needs the data files, lang files and openttd executable in a different location. # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
ifdef OSXAPP ifdef OSXAPP
AI_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
else else
AI_DIR = $(BUNDLE_DIR)/ai
DATA_DIR = $(BUNDLE_DIR)/data DATA_DIR = $(BUNDLE_DIR)/data
LANG_DIR = $(BUNDLE_DIR)/lang LANG_DIR = $(BUNDLE_DIR)/lang
TTD_DIR = $(BUNDLE_DIR) TTD_DIR = $(BUNDLE_DIR)
@ -42,6 +44,7 @@ bundle: all
@echo '[BUNDLE] Constructing bundle' @echo '[BUNDLE] Constructing bundle'
$(Q)rm -rf "$(BUNDLE_DIR)" $(Q)rm -rf "$(BUNDLE_DIR)"
$(Q)mkdir -p "$(BUNDLE_DIR)" $(Q)mkdir -p "$(BUNDLE_DIR)"
$(Q)mkdir -p "$(BUNDLE_DIR)/ai"
$(Q)mkdir -p "$(BUNDLE_DIR)/docs" $(Q)mkdir -p "$(BUNDLE_DIR)/docs"
$(Q)mkdir -p "$(BUNDLE_DIR)/media" $(Q)mkdir -p "$(BUNDLE_DIR)/media"
$(Q)mkdir -p "$(BUNDLE_DIR)/scripts" $(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
@ -57,6 +60,7 @@ ifdef OSXAPP
$(Q)cp "$(ROOT_DIR)/os/macosx/splash.png" "$(DATA_DIR)" $(Q)cp "$(ROOT_DIR)/os/macosx/splash.png" "$(DATA_DIR)"
endif endif
$(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/" $(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/"
$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut "$(AI_DIR)/"
$(Q)cp "$(BIN_DIR)/data/"*.grf "$(DATA_DIR)/" $(Q)cp "$(BIN_DIR)/data/"*.grf "$(DATA_DIR)/"
$(Q)cp "$(BIN_DIR)/data/"*.obg "$(DATA_DIR)/" $(Q)cp "$(BIN_DIR)/data/"*.obg "$(DATA_DIR)/"
$(Q)cp "$(BIN_DIR)/data/"*.obs "$(DATA_DIR)/" $(Q)cp "$(BIN_DIR)/data/"*.obs "$(DATA_DIR)/"
@ -159,6 +163,7 @@ install: bundle
$(Q)install -d "$(INSTALL_BINARY_DIR)" $(Q)install -d "$(INSTALL_BINARY_DIR)"
$(Q)install -d "$(INSTALL_ICON_DIR)" $(Q)install -d "$(INSTALL_ICON_DIR)"
$(Q)install -d "$(INSTALL_DATA_DIR)/gm" $(Q)install -d "$(INSTALL_DATA_DIR)/gm"
$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
$(Q)install -d "$(INSTALL_DATA_DIR)/data" $(Q)install -d "$(INSTALL_DATA_DIR)/data"
$(Q)install -d "$(INSTALL_DATA_DIR)/lang" $(Q)install -d "$(INSTALL_DATA_DIR)/lang"
$(Q)install -d "$(INSTALL_DATA_DIR)/scripts" $(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
@ -169,6 +174,7 @@ else
$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}" $(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
endif endif
$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang" $(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data" $(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts" $(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)" $(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"

7
os/win32/installer/install.nsi
View File

@ -106,6 +106,10 @@ Section "!OpenTTD" Section1
SetOutPath "$INSTDIR\lang\" SetOutPath "$INSTDIR\lang\"
File ${PATH_ROOT}bin\lang\*.lng File ${PATH_ROOT}bin\lang\*.lng
; Copy AI files
SetOutPath "$INSTDIR\ai\"
File ${PATH_ROOT}bin\ai\compat_*.nut
; Copy data files ; Copy data files
SetOutPath "$INSTDIR\data\" SetOutPath "$INSTDIR\data\"
File ${PATH_ROOT}bin\data\*.grf File ${PATH_ROOT}bin\data\*.grf
@ -298,6 +302,9 @@ Section "Uninstall"
Delete "$INSTDIR\cached_sprites.*" Delete "$INSTDIR\cached_sprites.*"
Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file
; AI files
Delete "$INSTDIR\ai\compat_*.nut"
; Data files ; Data files
Delete "$INSTDIR\data\opntitle.dat" Delete "$INSTDIR\data\opntitle.dat"