From 6bcd7b8fd77ef0748bebcca70d8dd9c6774b8c48 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 14 Sep 2006 01:01:17 +0000
Subject: Inno Setup now runs headless from the command line

svn path=/trunk/; revision=5931
---
 packages/win32_inno/Makefile       | 13 ++++++++++---
 packages/win32_inno/pd-inno.iss.in |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index baaf191b..83131e7b 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -29,8 +29,10 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 PD_INNO_SETUP = pd-inno.iss
 
 package:  $(PD_INNO_SETUP)
-	start $(PD_INNO_SETUP)
-#	start "c:\\Program Files\\Inno Setup 5\\Compil32.exe /cc C:\\msys\\1.0\\\home\\**\\packages\\win32_inno\\pd-inno.iss"
+## this pops up the GUI app
+#	start $(PD_INNO_SETUP)
+## this compiles the package on the command line
+	/c/Program\ Files/Inno\ Setup\ 5/ISCC.exe $(PD_INNO_SETUP)
 	@echo " "
 	@echo "win32_inno install succeeded!"
 
@@ -45,7 +47,7 @@ pd_install: build_pd
 #	-make -C $(pd_src)/src $(DEST_PATHS) install
 	make -C $(pd_src)/src -f makefile.mingw $(DEST_PATHS) install
 
-install: pd_install prebuilt_install lib_install exe_install
+install: pd_install prebuilt_install lib_install exe_install gripd_hack
 	@echo " "
 	@echo "win32_inno install succeeded!"
 
@@ -99,6 +101,11 @@ exe_install:
 no_compile_hacks:
 	cp -a /c/Program\ Files/pd-0.38-4 $(DESTDIR)$(prefix)/
 
+gripd_hack: GRIPD_ZIP=$(CWD)/gripd-0.1.1.zip
+gripd_hack:
+	test -e $(GRIPD_ZIP) && \
+		cd $(DESTDIR)$(prefix) && unzip $(GRIPD_ZIP)
+
 $(PD_INNO_SETUP): $(PD_INNO_SETUP).in
 	@echo "Making Inno Setup file: $(PD_INNO_SETUP)"
 	cat "$(PD_INNO_SETUP).in" | \
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index bb814d49..5137976f 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -45,9 +45,9 @@ Name: {group}\GrIPD; Filename: {app}\gripd\gripd.exe
 #endif
 
 
-[Run]
+;[Run]
 ; NOTE: The following entry contains an English phrase ("Launch"). You are free to translate it into another language if required.
-Filename: {app}\bin\pd.exe; Description: Launch Pure Data; Flags: nowait postinstall skipifsilent
+;Filename: {app}\bin\pd.exe; Description: Launch Pure Data; Flags: nowait postinstall skipifsilent
 
 [UninstallDelete]
 Type: files; Name: {app}\pd.url
-- 
cgit v1.2.1