(svn r14580) -Fix [FS#2404]: scripts directory not being copied into bundles.
authorrubidium
Sun, 16 Nov 2008 13:05:39 +0000
changeset 10329 e7801276a827
parent 10328 7500e2e4c8ab
child 10330 26352b2a0337
(svn r14580) -Fix [FS#2404]: scripts directory not being copied into bundles.
Makefile.bundle.in
os/win32/installer/install.nsi
--- a/Makefile.bundle.in	Thu Nov 13 20:26:06 2008 +0000
+++ b/Makefile.bundle.in	Sun Nov 16 13:05:39 2008 +0000
@@ -39,6 +39,7 @@
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(DATA_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
@@ -69,6 +70,7 @@
 endif
 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
 	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
 	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
@@ -149,6 +151,7 @@
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(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)/docs/"* "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
--- a/os/win32/installer/install.nsi	Thu Nov 13 20:26:06 2008 +0000
+++ b/os/win32/installer/install.nsi	Sun Nov 16 13:05:39 2008 +0000
@@ -120,6 +120,10 @@
 	SetOutPath "$INSTDIR\scenario\heightmap\"
 	File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.*
 
+	; Copy the scripts
+	SetOutPath "$INSTDIR\scripts\"
+	File ${PATH_ROOT}bin\scripts\*.*
+
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
 
@@ -296,6 +300,9 @@
 	; Language files
 	Delete "$INSTDIR\lang\*.lng"
 
+	; Scripts
+	Delete "$INSTDIR\scripts\*.lng"
+
 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
 	RMDir "$SMPROGRAMS\$SHORTCUTS"