diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 12 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | distrib/prep-bin-dist-mingw-greencard | 4 | ||||
| -rw-r--r-- | docs/building/building.sgml | 6 | ||||
| -rw-r--r-- | docs/ffi.sgml | 2 | ||||
| -rw-r--r-- | ghc/InstallShield/File Groups/Profiling Libraries.fgl | 4 | ||||
| -rw-r--r-- | ghc/InstallShield/File Groups/Program Executable Files.fgl | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 14 |
10 files changed, 28 insertions, 28 deletions
@@ -21,7 +21,7 @@ endif ifneq "$(Project)" "" ifeq "$(Project)" "GreenCard" - ProjectDirectory=green-card + ProjectDirectory=greencard else ifeq "$(Project)" "HaskellDirect" ProjectDirectory=hdirect @@ -12,7 +12,7 @@ the following directories: haggis The Haggis GUI toolkit happy The Happy Haskell parser generator hdirect Haskell interop tool - green-card A foreign function interface pre-processor for Haskell. + greencard A foreign function interface pre-processor for Haskell. libraries Haskell libraries (reqd. by ghc) nofib The NoFib Haskell benchmarking suite diff --git a/aclocal.m4 b/aclocal.m4 index ea73a21444..0fb7fcd006 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -269,15 +269,15 @@ AS_IF([test "$fp_num1" $2 "$fp_num2"], [$4], [$5])[]dnl dnl -dnl Check for Greencard and version. +dnl Check for GreenCard and version. dnl AC_DEFUN(FPTOOLS_GREENCARD, [ -AC_PATH_PROG(GreencardCmd,greencard) +AC_PATH_PROG(GreenCardCmd,greencard) AC_CACHE_CHECK([for version of greencard], fptools_cv_greencard_version, changequote(, )dnl -[if test x"$GreencardCmd" != x; then - fptools_cv_greencard_version="`$GreencardCmd --version | +[if test x"$GreenCardCmd" != x; then + fptools_cv_greencard_version="`$GreenCardCmd --version | grep 'version' | sed -e 's/greencard. version \([^ ]*\).*/\1/g'`" else fptools_cv_greencard_version="" @@ -286,8 +286,8 @@ changequote([, ])dnl ]) FP_COMPARE_VERSIONS([$fptools_cv_greencard_version],[-lt],[$1], [AC_MSG_ERROR([greencard version $1 or later is required (found '$fptools_cv_greencard_version')])])[]dnl -GreencardVersion=$fptools_cv_greencard_version -AC_SUBST(GreencardVersion) +GreenCardVersion=$fptools_cv_greencard_version +AC_SUBST(GreenCardVersion) ]) dnl diff --git a/configure.ac b/configure.ac index def4085fab..bba4b3cd5a 100644 --- a/configure.ac +++ b/configure.ac @@ -727,10 +727,10 @@ fi AC_ARG_WITH(greencard, [ --with-greencard=<greencard compiler> - Use a command different from 'green-card' to compile GreenCard files + Use a command different from 'greencard' to compile GreenCard files ], [ -GreencardCmd=$withval; +GreenCardCmd=$withval; FPTOOLS_GREENCARD(3.00) ] ) diff --git a/distrib/prep-bin-dist-mingw-greencard b/distrib/prep-bin-dist-mingw-greencard index 68ff6fd0f2..ef57a000ec 100644 --- a/distrib/prep-bin-dist-mingw-greencard +++ b/distrib/prep-bin-dist-mingw-greencard @@ -24,8 +24,8 @@ if ! [ -d bin/i386-unknown-mingw32 ] ; then fi;
echo "rejig bin/"
-cp bin/i386-unknown-mingw32/green-card.exe $binary_dir/bin
-strip $binary_dir/bin/green-card.exe
+cp bin/i386-unknown-mingw32/greencard.exe $binary_dir/bin
+strip $binary_dir/bin/greencard.exe
echo "rejig lib/"
cp lib/i386-unknown-mingw32/* $binary_dir
diff --git a/docs/building/building.sgml b/docs/building/building.sgml index 23c181dac8..bd5246c598 100644 --- a/docs/building/building.sgml +++ b/docs/building/building.sgml @@ -741,11 +741,11 @@ $ cvs checkout nofib/spectral </varlistentry> <varlistentry> - <term><literal>green-card</literal></term> - <indexterm><primary><literal>green-card</literal></primary><secondary>project</secondary></indexterm> + <term><literal>greencard</literal></term> + <indexterm><primary><literal>greencard</literal></primary><secondary>project</secondary></indexterm> <listitem> <para>The <ulink - url="http://www.haskell.org/greencard/">Green Card</ulink> + url="http://www.haskell.org/greencard/">GreenCard</ulink> system for generating Haskell foreign function interfaces.</para> </listitem> diff --git a/docs/ffi.sgml b/docs/ffi.sgml index 067f790183..bb5d78b9a2 100644 --- a/docs/ffi.sgml +++ b/docs/ffi.sgml @@ -11,7 +11,7 @@ interfaces provided by GHC and Hugs. However, the FFI specified in this document is not in the market of trying to completely bridge the gap between the actual type of an external function, and what is a <Emphasis>convenient</Emphasis> type for that function to the Haskell -programmer. That is the domain of tools like HaskellDirect or Green Card, both +programmer. That is the domain of tools like HaskellDirect or GreenCard, both of which are capable of generating Haskell code that uses this FFI. </Para> diff --git a/ghc/InstallShield/File Groups/Profiling Libraries.fgl b/ghc/InstallShield/File Groups/Profiling Libraries.fgl index eb9a9281cc..8614722c73 100644 --- a/ghc/InstallShield/File Groups/Profiling Libraries.fgl +++ b/ghc/InstallShield/File Groups/Profiling Libraries.fgl @@ -16,7 +16,7 @@ file5=C:\TEMP\fptools\hslibs\net\libHSnet_p.a file6=C:\TEMP\fptools\hslibs\text\libHStext_p.a file7=C:\TEMP\fptools\hslibs\util\libHSutil_p.a file8=C:\TEMP\fptools\hslibs\win32\src\libHSwin32_p.a -file9=C:\TEMP\fptools\green-card\lib\ghc\libHSgreencard_p.a +file9=C:\TEMP\fptools\greencard\lib\ghc\libHSgreencard_p.a SubDir0=lib\imports [lib\imports] @@ -84,7 +84,7 @@ file30=C:\TEMP\fptools\hslibs\data\edison\Seq\BankersQueue.p_hi [lib\imports\greencard] fulldirectory= -file0=C:\TEMP\fptools\green-card\lib\ghc\StdDIS.p_hi +file0=C:\TEMP\fptools\greencard\lib\ghc\StdDIS.p_hi [lib\imports\lang] fulldirectory= diff --git a/ghc/InstallShield/File Groups/Program Executable Files.fgl b/ghc/InstallShield/File Groups/Program Executable Files.fgl index 91c00d942b..14790cd555 100644 --- a/ghc/InstallShield/File Groups/Program Executable Files.fgl +++ b/ghc/InstallShield/File Groups/Program Executable Files.fgl @@ -80,8 +80,8 @@ file34=C:\TEMP\fptools\ghc\lib\std\cbits\libHSstd_cbits.a file35=C:\TEMP\fptools\ghc\lib\std\cbits\libHSstd_cbits_imp.a file36=C:\TEMP\fptools\hslibs\win32\src\libHSwin32_imp.a file37=C:\TEMP\fptools\hslibs\win32\src\libHSwin32.a -file38=C:\TEMP\fptools\green-card\lib\ghc\libHSgreencard_imp.a -file39=C:\TEMP\fptools\green-card\lib\ghc\libHSgreencard.a +file38=C:\TEMP\fptools\greencard\lib\ghc\libHSgreencard_imp.a +file39=C:\TEMP\fptools\greencard\lib\ghc\libHSgreencard.a file40=C:\TEMP\fptools\ghc\utils\hscpp\hscpp file41=C:\TEMP\fptools\ghc\utils\mkdependHS\mkdependHS file42=C:\TEMP\fptools\hslibs\net\libHSnet_imp.a @@ -308,7 +308,7 @@ file22=C:\TEMP\fptools\hslibs\text\haxml\lib\Haskell2Xml.hi [lib\imports\greencard] fulldirectory= -file0=C:\TEMP\fptools\green-card\lib\ghc\StdDIS.hi +file0=C:\TEMP\fptools\greencard\lib\ghc\StdDIS.hi [lib\imports\concurrent] fulldirectory= diff --git a/mk/config.mk.in b/mk/config.mk.in index 0401de40c1..3153e495e7 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -101,9 +101,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ # build the libs first if we're bootstrapping from .hc files ifeq "$(BootingFromHc)" "YES" -AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock alex +AllProjects = glafp-utils libraries hslibs ghc greencard happy hdirect hood nofib haddock alex else -AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock alex +AllProjects = glafp-utils ghc libraries hslibs greencard happy hdirect hood nofib haddock alex endif # @@ -386,9 +386,9 @@ HappyHcOpts = -O ################################################################################ # -# green-card project +# greencard project # -# Green-card specific options +# GreenCard specific options # ################################################################################ @@ -853,10 +853,10 @@ ILASM = ilasm GHC_PKG = @GhcPkgCmd@ # -# Greencard +# GreenCard # -GREENCARD = @GreencardCmd@ -GREENCARD_VERSION = @GreencardVersion@ +GREENCARD = @GreenCardCmd@ +GREENCARD_VERSION = @GreenCardVersion@ # # Happy |