Windows-Installer mit GTK-Abhängigkeiten

diff --git a/Makefile.am b/Makefile.am
index 9274aaa..4f8b512 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,12 +35,10 @@ CLEANFILES = sm.desktop
 if WIN32
 INSTALLER_BASE = screen-message-setup-@PACKAGE_VERSION@
 INSTALLER = $(INSTALLER_BASE).exe
-CLEANFILES += setup-app-ver-name.iss 
-setup-app-ver-name.iss:
-       echo "AppVerName=Screen Message @PACKAGE_VERSION@" > $@
+CLEANFILES +=  setup.iss $(INSTALLER)
 
-$(INSTALLER): setup.iss sm.exe setup-app-ver-name.iss
-       "$(WINE)" "$(ISCC)" /O. /F$(INSTALLER_BASE) $< 
+$(INSTALLER): setup.iss sm.exe 
+       "$(WINE)" "$(ISCC)" /O. "/F$(INSTALLER_BASE)" $< 
 
 installer: $(INSTALLER)
 

diff --git a/configure.ac b/configure.ac
index f32b452..c284c0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,17 @@
 AC_INIT(screen-message, 0.18, mail@joachim-breitner.de)
 AC_CONFIG_SRCDIR([sm.c])
 AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_FILES([setup.iss])
 
 AS_CASE($host,
        [*mingw32msvc*],[win32=true],
        [win32=false])
 
 AM_CONDITIONAL(WIN32, test "x$win32" = xtrue)
+AS_IF([test "x$win32" = xtrue],[
+        AC_CHECK_TOOL(WINE,[wine],[],[])
+        AC_CHECK_TOOL(WINEPATH,[winepath],[],[])
+       ])
 
 AC_ARG_WITH([iscc],
             [AS_HELP_STRING([--with-issc=PATH],
@@ -16,7 +21,6 @@ AC_ARG_WITH([iscc],
 
 AS_IF([test "x$with_iscc" != xno],
            [
-           AC_CHECK_TOOL(WINE,[wine],[],[])
            AC_SUBST(ISCC,[$with_iscc])
            ],
            [
@@ -34,7 +38,8 @@ AC_ARG_WITH([win32-gtk],
             [with_win32_gtk=no])
 
 AS_IF([test "x$with_win32_gtk" != xno],
-            [AS_VAR_APPEND(PKG_CONFIG," --define-variable prefix=$with_win32_gtk")
+           [AC_SUBST(WIN32_GTK, [`$WINEPATH -w $with_win32_gtk`])
+            AS_VAR_APPEND(PKG_CONFIG," --define-variable prefix=$with_win32_gtk")
             export PKG_CONFIG_PATH="$with_win32_gtk/lib/pkgconfig:$PKG_CONFIG_PATH"
            ],
            [

diff --git a/setup.iss.in b/setup.iss.in
new file mode 100644 (file)
index 0000000..e129ef7
--- /dev/null
+++ b/setup.iss.in
@@ -0,0 +1,50 @@
+[Setup]\r
+; NOTE: The value of AppId uniquely identifies this application.\r
+; Do not use the same AppId value in installers for other applications.\r
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
+AppId={{b1390e3b1a38d9c94e5041b64b3b8ccb}\r
+;AppId={{1DB6EA4F-D387-432D-A739-283E0E916AF6}\r
+AppName=Screen Message\r
+AppVerName=Screen Message @PACKAGE_VERSION@\r
+AppPublisher=Joachim Breitner\r
+AppPublisherURL=http://www.joachim-breitner.de/projects#screen-message\r
+AppSupportURL=http://www.joachim-breitner.de/projects#screen-message\r
+AppUpdatesURL=http://www.joachim-breitner.de/projects#screen-message\r
+DefaultDirName={pf}\Screen Message\r
+DefaultGroupName=Screen Message\r
+AllowNoIcons=yes\r
+OutputBaseFilename=screen-message-setup\r
+Compression=lzma\r
+SolidCompression=yes\r
+; Is there a point in displaying the LICENSE file?\r
+; LicenseFile=LICENSE\r
+InfoBeforeFile=README.Win32\r
+\r
+[Files]\r
+Source: "sm.exe"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs\r
+;Source: "@WIN32_GTK@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs\r
+Source: "@WIN32_GTK@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs\r
+Source: "@WIN32_GTK@\bin\libgtk-win32*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libgdk-win32*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libglib*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libgobject*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libpango*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libgdk_pixbuf*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libcairo*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libgio*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libgmodule*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libfontconfig*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\freetype*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libpng*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\zlib*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libexpat*.dll"; DestDir: "{app}\bin"\r
+Source: "@WIN32_GTK@\bin\libatk*.dll"; DestDir: "{app}\bin"\r
+\r
+[Icons]\r
+Name: "{group}\Screen Message"; Filename: "{app}\bin\sm.exe"\r
+Name: "{group}\{cm:UninstallProgram,arbtt}"; Filename: "{uninstallexe}"\r
+\r
+[Languages]\r
+Name: "english"; MessagesFile: "compiler:Default.isl"\r
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"\r