From c36bdfd7b96c86817ac185352660aac8fbf21c55 Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 19 May 2005 19:07:18 +0000 Subject: [PATCH] Look for tar in configure, since we must have gtar on Solaris and tar on Windows. --- src/ReleaseProcedure | 23 ++++++++++++++++------- src/config.mk.in | 1 + src/configure.ac | 8 +++++++- src/gf.wxs.in | 30 +++++++++++++++--------------- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/ReleaseProcedure b/src/ReleaseProcedure index 24a350ec8..30749b926 100644 --- a/src/ReleaseProcedure +++ b/src/ReleaseProcedure @@ -70,7 +70,7 @@ buildarchtranslate: i686: i586 $ cd src $ ./configure && make rpm -12. Build a generic binary x86/linux (should be done on a Linux box, +12. Build a generic binary x86/linux package (should be done on a Linux box, e.g. banded.medic.chalmers.se): $ cd src @@ -95,12 +95,21 @@ buildarchtranslate: i686: i586 TODO: Use OS X PackageMaker to build a .pkg-file which can be installed using the standard OS X Installer program. -15. Build a Windows package: +15. Build a binary Cygwin package (should be done on a Windows + machine with Cygwin): + + $ cd src + $ ./configure && make binary-dist + +16. Build a Windows MSI package (FIXME: This doesn't work right, + pathnames with backslashes and spaces are not handled + correctly in Windows. We only release abinary tarball + for Cygwin right now.): $ cd src $ ./configure && make all windows-msi -16. Add new GF package release to SourceForge: +17. Add new GF package release to SourceForge: - Project page -> Admin -> File releases -> Add release (for the GF package) @@ -121,7 +130,7 @@ buildarchtranslate: i686: i586 * sparc binary tarball -> Sparc/.gz * source package -> Any/Source .gz -17. Add new GF-editor release. Repeat the steps above, but +18. Add new GF-editor release. Repeat the steps above, but with GF-editor: - Add files and set properties: @@ -130,7 +139,7 @@ buildarchtranslate: i686: i586 figured out how to make noarch rpms from the same spec as arch-specific ones) -18. (Only if releasing a new grammars distribution) +19. (Only if releasing a new grammars distribution) Add new GF-grammars release. Repeat the steps above, but with GF-grammars: @@ -138,6 +147,6 @@ buildarchtranslate: i686: i586 * grammar tarball -> Platform independent/Source .gz -19. Update website. +20. Update website. -20. Party! +21. Party! diff --git a/src/config.mk.in b/src/config.mk.in index dc04386ca..9760d969a 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -18,6 +18,7 @@ LDFLAGS = @LDFLAGS@ EXEEXT = @EXEEXT@ INSTALL = @INSTALL@ +TAR = @TAR@ GHC = "@GHC@" GHCI = "@GHCI@" diff --git a/src/configure.ac b/src/configure.ac index 3bfd9c978..ddfa6165e 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4,7 +4,7 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF]) AC_PREREQ(2.53) -AC_REVISION($Revision: 1.21 $) +AC_REVISION($Revision: 1.22 $) AC_CONFIG_FILES([config.mk jgf gf.wxs]) @@ -132,6 +132,12 @@ fi AC_SUBST(ENABLE_JAVA) +dnl *********************************************** +dnl TAR +dnl *********************************************** + +AC_CHECK_PROGS(TAR, gtar tar) + dnl *********************************************** dnl Other programs dnl *********************************************** diff --git a/src/gf.wxs.in b/src/gf.wxs.in index 56d6bd66f..ffa680abf 100644 --- a/src/gf.wxs.in +++ b/src/gf.wxs.in @@ -16,30 +16,30 @@ - - + + + Name="GF" Target="[!GFEXE]" /> - - + + - - - - + + + + + Name="GFEditor" LongName="GF Editor" Target="[!GFEditorBat]" + WorkingDirectory="INSTALLDIR" /> - + - - + +