From c23f4c5c592e6ef3cdc8a7a1a6c7870de8783511 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Thu, 2 Jan 2014 15:22:51 +0100 Subject: Create MakeMSI templates from configure --- configure.ac | 8 ++++++-- win/pjctl.mm | 41 ----------------------------------------- win/pjctl.mm.in | 31 +++++++++++++++++++++++++++++++ win/pjctl.ver | 24 ------------------------ win/pjctl.ver.in | 13 +++++++++++++ 5 files changed, 50 insertions(+), 67 deletions(-) delete mode 100644 win/pjctl.mm create mode 100644 win/pjctl.mm.in delete mode 100644 win/pjctl.ver create mode 100644 win/pjctl.ver.in diff --git a/configure.ac b/configure.ac index 13f8ec5..7b9449a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,12 @@ AC_PREREQ([2.64]) -AC_INIT([pjctl], +AC_INIT([pjctl (PJLink Projector Control)], [1], [benjaminfranzke@googlemail.com], [pjctl], [https://git.bnfr.net/pjctl/]) +AC_SUBST([PACKAGE_AUTHOR], ["Benjamin Franzke"]) +AC_SUBST([PACKAGE_DESCRIPTION], ["Control a PJLink Projector"]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -34,5 +36,7 @@ esac AM_CONDITIONAL([HAVE_WINDOWS], [test "x$have_windows" = "xyes"]) AC_CONFIG_FILES([Makefile - src/Makefile]) + src/Makefile + win/pjctl.mm + win/pjctl.ver]) AC_OUTPUT diff --git a/win/pjctl.mm b/win/pjctl.mm deleted file mode 100644 index b7dce3d..0000000 --- a/win/pjctl.mm +++ /dev/null @@ -1,41 +0,0 @@ -;---------------------------------------------------------------------------- -; MODULE NAME: pjctl.mm -; -; $Author: USER "Benjamin Franzke" $ -; $Revision: 1 $ -; $Date: 04 Dec 2012 15.15:00 $ -; -;---------------------------------------------------------------------------- - - -;--- Include MAKEMSI support (with my customisations and MSI branding) ------ -;#define VER_FILENAME.VER TryMe.Ver ;;I only want one VER file for all samples! (this line not actually required in "tryme.mm") - -#define? DEPT_ARP_URL_PUBLISHER http://git.bnfr.net/pjctl -#define? DEPT_ARP_URL_TECHNICAL_SUPPORT benjaminfranzke@googlemail.com -#define? DEPT_NAME Benjamin Franzke -#define? DEPT_ADDRESS ;; -#define? COMPANY_CONTACT_NAME <$DEPT_NAME> -#define? COMPANY_CONTACT_NAME_PHONE ;;No phone -#define? COMPANY_SUMMARY_SCHEMA 110 ;;Minimum v1.1 Installer - -#define? UISAMPLE_LEFTSIDE_TEXT_FONT_COLOR &H7F0000 ;;Medium Blue in BGR (believe it or not...) -#( - #define? UISAMPLE_LEFTSIDE_TEXT - Developed by <$DEPT_NAME>. -#) - -#include "ME.MMH" -;#define? COMMONFRAMEWORK_ZIP_SOURCE_FOR_BACKUP N ;;No "insurance" until I bother to install "info zip"... -;#include "DEPT.MMH" - -;--- Want to debug (not common) --------------------------------------------- -;#debug on -;#Option DebugLevel=^NONE, +OpSys^ - - -;--- Define default location where file should install and add files -------- -<$DirectoryTree Key="INSTALLDIR" Dir="c:\program files\pjctl\" CHANGE="\" PrimaryFolder="Y"> -<$Files "..\src\pjctl-no-console.exe" DestDir="INSTALLDIR"> -<$Files "..\src\pjctl.exe" DestDir="INSTALLDIR"> -<$Files "C:\cygwin\bin\cygwin1.dll" DestDir="INSTALLDIR"> diff --git a/win/pjctl.mm.in b/win/pjctl.mm.in new file mode 100644 index 0000000..7d25cf8 --- /dev/null +++ b/win/pjctl.mm.in @@ -0,0 +1,31 @@ +;--- Include MAKEMSI support (with my customisations and MSI branding) ------ +;#define VER_FILENAME.VER TryMe.Ver ;;I only want one VER file for all samples! (this line not actually required in "tryme.mm") + +#define? DEPT_ARP_URL_PUBLISHER @PACKAGE_URL@ +#define? DEPT_ARP_URL_TECHNICAL_SUPPORT @PACKAGE_BUGREPORT@ +#define? DEPT_NAME @PACKAGE_AUTHOR@ +#define? DEPT_ADDRESS ;; +#define? COMPANY_CONTACT_NAME <$DEPT_NAME> +#define? COMPANY_CONTACT_NAME_PHONE ;;No phone +#define? COMPANY_SUMMARY_SCHEMA 110 ;;Minimum v1.1 Installer + +#define? UISAMPLE_LEFTSIDE_TEXT_FONT_COLOR &H7F0000 ;;Medium Blue in BGR (believe it or not...) +#( + #define? UISAMPLE_LEFTSIDE_TEXT + Developed by <$DEPT_NAME>. +#) + +#include "ME.MMH" +;#define? COMMONFRAMEWORK_ZIP_SOURCE_FOR_BACKUP N ;;No "insurance" until I bother to install "info zip"... +;#include "DEPT.MMH" + +;--- Want to debug (not common) --------------------------------------------- +;#debug on +;#Option DebugLevel=^NONE, +OpSys^ + + +;--- Define default location where file should install and add files -------- +<$DirectoryTree Key="INSTALLDIR" Dir="c:\program files\pjctl\" CHANGE="\" PrimaryFolder="Y"> +<$Files "..\src\pjctl-no-console.exe" DestDir="INSTALLDIR"> +<$Files "..\src\pjctl.exe" DestDir="INSTALLDIR"> +<$Files "C:\cygwin\bin\cygwin1.dll" DestDir="INSTALLDIR"> diff --git a/win/pjctl.ver b/win/pjctl.ver deleted file mode 100644 index f038528..0000000 --- a/win/pjctl.ver +++ /dev/null @@ -1,24 +0,0 @@ -;---------------------------------------------------------------------------- -; -; MODULE NAME: pjctl.ver -; -; $Author: USER "Benjamin Franzke" $ -; $Revision: 1 $ -; $Date: 10 Oct 2007 17:25:32 $ -; -; DESCRIPTION: pjctl msi. -; -;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -; ProductName = pjctl (PJLink Projector Control) -; DESCRIPTION = Control a PJLink Projector -; Installed = WINDOWS_ALL -; Guid.UpgradeCode = {B20CBBBC-B192-474D-B4C9-616FC9238F2B} -; MsiName = pjctl -;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - -;############################################################################ -VERSION : 1.0.0 -DATE : 25 Feb 2003 -CHANGES : First cut. - diff --git a/win/pjctl.ver.in b/win/pjctl.ver.in new file mode 100644 index 0000000..8315013 --- /dev/null +++ b/win/pjctl.ver.in @@ -0,0 +1,13 @@ +;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +; ProductName = @PACKAGE_NAME@ +; DESCRIPTION = @PACKAGE_DESCRIPTION@ +; Installed = WINDOWS_ALL +; Guid.UpgradeCode = {B20CBBBC-B192-474D-B4C9-616FC9238F2B} +; MsiName = @PACKAGE@-@PACKAGE_VERSION@ +;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +;############################################################################ +VERSION : @PACKAGE_VERSION@.0.0 +DATE : 02 Jan 2014 +CHANGES : Support passwords on Windows -- cgit