Tue Mar 6 19:56:05 PST 2012 John Meacham <[email protected]> * begin adding haskell2010 package
Tue Mar 6 21:50:16 PST 2012 John Meacham <[email protected]> * add auto-generated make rules for all libraries.
New patches: [begin adding haskell2010 package John Meacham <[email protected]>**20120307035605 Ignore-this: eaae9201d70dece4f2e7bb115d295e07 ] move ./lib/flat-foreign/flat-foreign.cabal ./lib/flat-foreign/flat-foreign.yaml adddir ./lib/haskell2010 adddir ./lib/haskell2010/Data addfile ./lib/haskell2010/haskell2010.yaml.m4 hunk ./Makefile.am 64 GHCOPTS= $(HSOPTS) -XBangPatterns -O @GHCFLAGS@ $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) $(GHCLANG) JHC_LIBS = jhc-1.0.hl base-1.0.hl haskell98-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl jhc-prim-1.0.hl - +# haskell2010-@[email protected] EXTRA_DIST = src/data rts utils docs src/FrontEnd/HsParser.y $(BUILT_SOURCES) \ lib/jhc lib/jhc-prim lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \ src/StringTable/StringTable_cbits.c src/StringTable/StringTable_cbits.h src/cbits/md5sum.c jhc.1 \ hunk ./Makefile.am 245 ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ haskell98-1.0.hl: lib/haskell98/haskell98.yaml base-1.0.hl ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.cabal base-1.0.hl - ./jhc $(LIB_OPTIONS) -ilib/flat-foreign -pjhc -pbase --build-hl $< -o $@ +flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml base-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +haskell2010-@[email protected]: lib/haskell2010/haskell2010.yaml.m4 jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ %.pdf: %.ps epstopdf $< --outfile $@ hunk ./Makefile.am 326 lib/base/Foreign/StablePtr.hs lib/base/Foreign/C.hs lib/base/Data/Bits.hs lib/base/Foreign/Marshal.hs \ lib/base/Foreign.hs lib/base/Data/Array/Unboxed.hs lib/base/Data/Function.hs lib/base/Data/Ix.hs \ lib/base/System/Info.hs jhc-1.0.hl -flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.cabal lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs \ +flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs \ lib/flat-foreign/Storable.hs lib/flat-foreign/Ptr.hs lib/flat-foreign/MarshalArray.hs lib/flat-foreign/Int.hs \ lib/flat-foreign/CString.hs lib/flat-foreign/Word.hs lib/flat-foreign/CError.hs lib/flat-foreign/CTypes.hs \ lib/flat-foreign/MarshalError.hs lib/flat-foreign/MarshalUtils.hs lib/flat-foreign/Bits.hs lib/flat-foreign/ForeignPtr.hs \ hunk ./configure.ac 79 dnl AX_CREATE_STDINT_H([cbits/_stdint.h]) +AC_SUBST(BYTE_ORDER) +AC_SUBST(EXTRA_PACKAGES) +AC_SUBST(GHCFLAGS) +AC_SUBST(GHCINC) +AC_SUBST(HAS_MONOID_DOC) AC_SUBST(HC) AC_SUBST(HCFLAGS) AC_SUBST(HSC2HS) hunk ./configure.ac 87 -AC_SUBST(GHCFLAGS) -AC_SUBST(EXTRA_PACKAGES) -AC_SUBST(RPMRELEASE) -AC_SUBST(SHORTVERSION) -AC_SUBST(BYTE_ORDER) -AC_SUBST(JLIBPATH) AC_SUBST(JETCPATH) hunk ./configure.ac 88 -AC_SUBST(HAS_MONOID_DOC) +AC_SUBST(JLIBPATH) AC_SUBST(MINGW) hunk ./configure.ac 90 +AC_SUBST(RPMRELEASE) +AC_SUBST(SHORTVERSION) +AC_SUBST(VERSION) AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_PATCH) hunk ./configure.ac 96 -AC_SUBST(GHCINC) AC_CONFIG_FILES([Makefile jhc.spec src/hs_src_config.h src/Version/Config.hs docs/building.mkd src/cbits/config.h src/data/targets.ini]) AC_OUTPUT hunk ./lib/flat-foreign/flat-foreign.yaml 1 -name: flat-foreign -version: 1.0 -maintainer: [email protected] -synopsis: Compatibility with non hierarchical FFI module names -description: - This package provides compatibility with the flat module names originally - proposed for the FFI modules, since hierarchical modules were introduced - at the same time, use of these aliases is rare. -homepage: http://www.haskell.org/definition/ -build-depends: base -exposed-modules: - -- FFI addendum (Foreign is in the base package) - Bits, CError, CForeign, CString, CTypes, ForeignPtr, Int, +Name: flat-foreign +Version: 1.0 +hs-source-dir: . +build-depends: [base, jhc] +exposed-modules: [ Bits, CError, CForeign, CString, CTypes, ForeignPtr, Int, MarshalAlloc, MarshalArray, MarshalError, MarshalUtils, Ptr, hunk ./lib/flat-foreign/flat-foreign.yaml 7 - StablePtr, Storable, Word + StablePtr, Storable, Word ] hunk ./lib/haskell2010/haskell2010.yaml.m4 1 +Name: haskell2010 +Version: __JHC_VERSION__ +Extensions: [ ForeignFunctionInterface, NoImplicitPrelude, + UnboxedTuples, UnboxedValues ] +Hs-Source-Dir: . +Options: [ --noauto, -pjhc, -pjhc-prim ] +Exposed-Modules: + - Prelude + - Control.Monad + - Data.Array + - Data.Bits + - Data.Char + - Data.Complex + - Data.Int + - Data.Ix + - Data.List + - Data.Maybe + - Data.Ratio + - Data.Word + - Foreign + - Foreign.C + - Foreign.C.Error + - Foreign.C.String + - Foreign.C.Types + - Foreign.ForeignPtr + - Foreign.Marshal + - Foreign.Marshal.Array + - Foreign.Marshal.Alloc + - Foreign.Marshal.Error + - Foreign.Marshal.Utils + - Foreign.Ptr + - Foreign.StablePtr + - Foreign.Storable + - Numeric + - System.Envirorment + - System.Exit + - System.IO + - System.IO.Error hunk ./selftest/Makefile 9 -XRecordWildCards -XRecursiveDo -XTupleSections -XParallelListComp \ -XGeneralizedNewtypeDeriving -XScopedTypeVariables -XFlexibleInstances \ -XTypeSynonymInstances -XMultiParamTypeClasses -XDeriveDataTypeable \ - -fglasgow-exts -XNoMonoLocalBinds -XNamedFieldPuns + -fglasgow-exts -XNoMonoLocalBinds -XNamedFieldPuns -I../src HC= ghc hunk ./utils/build_extlibs.prl 45 next unless $name; next unless $version; - $options = "$options --deps tmp/$name-$version-deps.yaml" if $opt_d; + $options = "$options --stop deps --deps tmp/$name-deps.yaml" if $opt_d; print("$name-$version.hl\n"),next if $opt_l; hunk ./utils/deps_to_make.prl 35 map { s/^\.\/// } @deps; foreach (@deps) { my $patch = $_; - push @deps, $patch if $patch =~ s/\.cabal$/.patch/ and -e $patch; + push @deps, $patch if $patch =~ s/\.(cabal|yaml)(.m4)?$/.patch/ and -e $patch; } push @targets, @{$y->{Target}} if $opt_e; for (@{$y->{Target}}) { [add auto-generated make rules for all libraries. John Meacham <[email protected]>**20120307055016 Ignore-this: a6febbaf42d19ca29b0541809182b93c ] hunk ./Makefile.am 63 GHCOPTS= $(HSOPTS) -XBangPatterns -O @GHCFLAGS@ $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) $(GHCLANG) -JHC_LIBS = jhc-1.0.hl base-1.0.hl haskell98-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl jhc-prim-1.0.hl -# haskell2010-@[email protected] +LIB_OPTIONS=$(RTSOPTS) $(JHC_TEST) -L- -L. +include library_deps.make + EXTRA_DIST = src/data rts utils docs src/FrontEnd/HsParser.y $(BUILT_SOURCES) \ lib/jhc lib/jhc-prim lib/base lib/haskell98 lib/flat-foreign $(JHC_LIBS) $(JHC_EXT_LIBS) \ src/StringTable/StringTable_cbits.c src/StringTable/StringTable_cbits.h src/cbits/md5sum.c jhc.1 \ hunk ./Makefile.am 82 cp -f $(srcdir)/src/RawFiles.hs $(destdir)/src/RawFiles.hs; \ fi -# we recreate the manual and man page here just to ensure they are up to date -#dist-hook: man manual $(BUILT_SOURCES) -# cp $(srcdir)/manual.html $(distdir)/manual.html -# cp $(srcdir)/jhc.1 $(distdir)/jhc.1 - - #find $(distdir) \( -name _darcs -o -name \*.ho \) -print | xargs rm -rf -- - all-local: $(JHC_LIBS) install-data-hook: $(JHC_LIBS) $(JHC_EXT_LIBS) hunk ./Makefile.am 227 CLEANFILES= $(JHC_LIBS) $(JHC_EXT_LIBS) HelloWorld Primes src/StringTable/Atom.hs src/RawFiles.hs -LIB_OPTIONS=$(RTSOPTS) $(JHC_TEST) -L- -L. - -jhc-prim-1.0.hl: lib/jhc-prim/jhc-prim.yaml - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -jhc-1.0.hl: lib/jhc/jhc.yaml jhc-prim-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -base-1.0.hl: lib/base/base.yaml jhc-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -applicative-1.0.hl: lib/applicative/applicative.yaml base-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -haskell98-1.0.hl: lib/haskell98/haskell98.yaml base-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml base-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ -haskell2010-@[email protected]: lib/haskell2010/haskell2010.yaml.m4 jhc-1.0.hl - ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ - %.pdf: %.ps epstopdf $< --outfile $@ hunk ./Makefile.am 287 TESTS=HelloWorld Primes -## autogenerated dependencies - -applicative-1.0.hl: lib/applicative/applicative.yaml lib/applicative/Control/Arrow.hs lib/applicative/Control/Applicative.hs lib/applicative/Data/Foldable.hs \ - lib/applicative/Control/Category.hs lib/applicative/Data/Traversable.hs base-1.0.hl jhc-1.0.hl -base-1.0.hl: lib/base/base.yaml lib/base/Debug/Trace.hs lib/base/Data/Array.hs \ - lib/base/Data/Typeable.hs lib/base/Text/Printf.hs lib/base/System/Directory.hs lib/base/Data/Maybe.hs \ - lib/base/System/IO/Error.hs lib/base/System/IO/Binary.hs lib/base/System/CPUTime.hs lib/base/System/IO/Pipe.hs \ - lib/base/Control/Monad/Instances.hs lib/base/Foreign/Marshal/Error.hs lib/base/System/Exit.hs lib/base/System/Environment.hs \ - lib/base/Data/Array/IO.hs lib/base/Data/Version.hs lib/base/Text/Show/Functions.hs lib/base/Control/Monad.hs \ - lib/base/Data/Functor.hs lib/base/Data/Monoid.hs lib/base/System/Locale.hs lib/base/System/IO.hs \ - lib/base/Foreign/Marshal/Pool.hs lib/base/Control/Monad/Fix.hs lib/base/Data/Complex.hs lib/base/Data/IORef.hs \ - lib/base/System/Console/GetOpt.hs lib/base/Data/List.hs lib/base/System/Cmd.hs lib/base/System/Random.hs \ - lib/base/Data/Unicode.hs lib/base/Foreign/ForeignPtr.hs lib/base/System/Time.hs lib/base/Control/Exception.hs \ - lib/base/Foreign/StablePtr.hs lib/base/Foreign/C.hs lib/base/Data/Bits.hs lib/base/Foreign/Marshal.hs \ - lib/base/Foreign.hs lib/base/Data/Array/Unboxed.hs lib/base/Data/Function.hs lib/base/Data/Ix.hs \ - lib/base/System/Info.hs jhc-1.0.hl -flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs \ - lib/flat-foreign/Storable.hs lib/flat-foreign/Ptr.hs lib/flat-foreign/MarshalArray.hs lib/flat-foreign/Int.hs \ - lib/flat-foreign/CString.hs lib/flat-foreign/Word.hs lib/flat-foreign/CError.hs lib/flat-foreign/CTypes.hs \ - lib/flat-foreign/MarshalError.hs lib/flat-foreign/MarshalUtils.hs lib/flat-foreign/Bits.hs lib/flat-foreign/ForeignPtr.hs \ - base-1.0.hl jhc-1.0.hl -haskell98-1.0.hl: lib/haskell98/haskell98.yaml lib/haskell98/System.hs lib/haskell98/List.hs lib/haskell98/Time.hs \ - lib/haskell98/Array.hs lib/haskell98/Random.hs lib/haskell98/Complex.hs lib/haskell98/Locale.hs \ - lib/haskell98/CPUTime.hs lib/haskell98/Ratio.hs lib/haskell98/Monad.hs lib/haskell98/Directory.hs \ - lib/haskell98/IO.hs lib/haskell98/Ix.hs lib/haskell98/Char.hs lib/haskell98/Maybe.hs \ - base-1.0.hl jhc-1.0.hl -jhc-1.0.hl: lib/jhc/jhc.yaml lib/jhc/Jhc/Prim.hs lib/jhc/Jhc/IO.hs lib/jhc/Jhc/Int.hs lib/jhc/Jhc/Inst/Enum.hs \ - lib/jhc/Prelude/IO.hs lib/jhc/Jhc/Order.hs lib/jhc/System/C/Stdio.hs \ - lib/jhc/Foreign/C/String.hs lib/jhc/Jhc/Show.hs lib/jhc/Jhc/Handle.hs lib/jhc/Jhc/Addr.hs lib/jhc/Numeric.hs \ - lib/jhc/Jhc/Float.hs lib/jhc/Jhc/Inst/Storable.hs lib/jhc/Jhc/Inst/Num.hs lib/jhc/Foreign/C/Types.hs lib/jhc/Data/Ratio.hs \ - lib/jhc/Jhc/List.hs lib/jhc/Jhc/Type/Float.hs lib/jhc/Foreign/Marshal/Utils.hs lib/jhc/Jhc/Basics.hs \ - lib/jhc/System/Mem.hs lib/jhc/Jhc/Type/Basic.hs lib/jhc/Jhc/Num.hs lib/jhc/Jhc/Text/Read.hs \ - lib/jhc/Jhc/Type/Ptr.hs lib/jhc/Foreign/C/Error.hs lib/jhc/Foreign/Storable.hs lib/jhc/Foreign/Ptr.hs lib/jhc/Jhc/Inst/Order.hs \ - lib/jhc/Jhc/Enum.hs lib/jhc/Jhc/Type/Handle.hs lib/jhc/Jhc/Tuples.hs lib/jhc/Jhc/String.hs lib/jhc/Prelude/Float.hs \ - lib/jhc/Jhc/Type/C.hs lib/jhc/Jhc/Inst/PrimEnum.hs lib/jhc/Jhc/Inst/Show.hs lib/jhc/Prelude/Text.hs \ - lib/jhc/Foreign/Marshal/Alloc.hs lib/jhc/Foreign/Marshal/Array.hs lib/jhc/Jhc/Options.hs lib/jhc/Prelude/CType.hs lib/jhc/Jhc/Monad.hs \ - lib/jhc/System/IO/Unsafe.hs lib/jhc/System/Mem/StableName.hs lib/jhc/Jhc/Inst/Read.hs lib/jhc/Jhc/Maybe.hs jhc-prim-1.0.hl -jhc-prim-1.0.hl: lib/jhc-prim/jhc-prim.yaml lib/jhc-prim/Jhc/Prim/IO.hs lib/jhc-prim/Jhc/Prim/Prim.hs lib/jhc-prim/Jhc/Prim/Wrapper.hs lib/jhc-prim/Jhc/Prim/Bits.hs - -containers-0.3.0.0.hl: lib/ext/containers.cabal base-1.0.hl applicative-1.0.hl jhc-1.0.hl lib/ext/containers.patch - perl utils/build_extlibs.prl $< -Diff-0.1.2.hl: lib/ext/Diff.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -html-1.0.1.2.hl: lib/ext/html.cabal jhc-1.0.hl - perl utils/build_extlibs.prl $< -HUnit-1.2.2.1.hl: lib/ext/HUnit.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -parsec-2.1.0.1.hl: lib/ext/parsec.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -transformers-0.2.1.0.hl: lib/ext/transformers.cabal base-1.0.hl applicative-1.0.hl - perl utils/build_extlibs.prl $< -pretty-1.0.1.1.hl: lib/ext/pretty.cabal jhc-1.0.hl - perl utils/build_extlibs.prl $< -QuickCheck-1.2.0.0.hl: lib/ext/QuickCheck.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -safe-0.2.hl: lib/ext/safe.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -smallcheck-0.4.hl: lib/ext/smallcheck.cabal base-1.0.hl haskell98-1.0.hl jhc-1.0.hl lib/ext/smallcheck.patch - perl utils/build_extlibs.prl $< -utility-ht-0.0.5.1.hl: lib/ext/utility-ht.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -xhtml-3000.2.0.1.hl: lib/ext/xhtml.cabal base-1.0.hl jhc-1.0.hl - perl utils/build_extlibs.prl $< -filepath-1.2.0.0.hl: lib/ext/filepath.cabal jhc-1.0.hl base-1.0.hl - perl utils/build_extlibs.prl $< -deepseq-1.1.0.2.hl: lib/ext/deepseq.cabal jhc-1.0.hl base-1.0.hl applicative-1.0.hl containers-0.3.0.0.hl - perl utils/build_extlibs.prl $< -bytestring-0.9.2.0.hl: lib/ext/bytestring.yaml base-1.0.hl - perl utils/build_extlibs.prl $< - -JHC_EXT_LIBS = containers-0.3.0.0.hl Diff-0.1.2.hl html-1.0.1.2.hl HUnit-1.2.2.1.hl parsec-2.1.0.1.hl \ - pretty-1.0.1.1.hl QuickCheck-1.2.0.0.hl safe-0.2.hl smallcheck-0.4.hl \ - xhtml-3000.2.0.1.hl transformers-0.2.1.0.hl filepath-1.2.0.0.hl deepseq-1.1.0.2.hl - JHC_MANUAL_FILES = docs/make.mkd options.mkd docs/dependency_format.mkd docs/pragmas.mkd docs/differences.mkd \ docs/unboxed.mkd rts/rts/jhc_rts.c src/FlagOpts.mkd src/FlagDump.mkd src/E/PrimOpt.hs \ drift_processed/E/TypeCheck.hs drift_processed/Options.hs hunk ./lib/haskell2010/haskell2010.yaml.m4 6 Extensions: [ ForeignFunctionInterface, NoImplicitPrelude, UnboxedTuples, UnboxedValues ] Hs-Source-Dir: . -Options: [ --noauto, -pjhc, -pjhc-prim ] +build-depends: [ jhc, base ] +#Options: [ --noauto ] Exposed-Modules: hunk ./lib/haskell2010/haskell2010.yaml.m4 9 - - Prelude - Control.Monad - Data.Array - Data.Bits hunk ./lib/haskell2010/haskell2010.yaml.m4 27 - Foreign.C.Types - Foreign.ForeignPtr - Foreign.Marshal - - Foreign.Marshal.Array - Foreign.Marshal.Alloc hunk ./lib/haskell2010/haskell2010.yaml.m4 28 + - Foreign.Marshal.Array - Foreign.Marshal.Error - Foreign.Marshal.Utils - Foreign.Ptr hunk ./lib/haskell2010/haskell2010.yaml.m4 35 - Foreign.StablePtr - Foreign.Storable - Numeric - - System.Envirorment + - Prelude + - System.Environment - System.Exit - System.IO - System.IO.Error addfile ./library_deps.make hunk ./library_deps.make 1 +base-1.0.hl: lib/base/base.yaml lib/base/System/Info.hs lib/base/Data/Int.hs lib/base/Debug/Trace.hs lib/base/Data/Array.hs \ + lib/base/Data/Typeable.hs lib/base/Text/Printf.hs lib/base/System/Directory.hs lib/base/Data/Word.hs lib/base/Data/Maybe.hs \ + lib/base/System/IO/Error.hs lib/base/System/IO/Binary.hs lib/base/System/CPUTime.hs lib/base/System/IO/Pipe.hs lib/base/Control/Monad/Instances.hs \ + lib/base/Foreign/Marshal/Error.hs lib/base/System/Exit.hs lib/base/System/Environment.hs lib/base/Data/Array/IO.hs lib/base/Data/Char.hs \ + lib/base/Data/Version.hs lib/base/Text/Show/Functions.hs lib/base/Control/Monad.hs lib/base/Data/Functor.hs lib/base/Data/Monoid.hs \ + lib/base/System/Locale.hs lib/base/System/IO.hs lib/base/Foreign/Marshal/Pool.hs lib/base/Prelude.hs lib/base/Control/Monad/Fix.hs \ + lib/base/Data/Complex.hs lib/base/Data/IORef.hs lib/base/System/Console/GetOpt.hs lib/base/Data/List.hs lib/base/System/Cmd.hs \ + lib/base/System/Random.hs lib/base/Data/Unicode.hs lib/base/Foreign/ForeignPtr.hs lib/base/System/Time.hs lib/base/Control/Exception.hs \ + lib/base/Foreign/StablePtr.hs lib/base/Foreign/C.hs lib/base/Data/Bits.hs lib/base/Foreign/Marshal.hs lib/base/Foreign.hs \ + lib/base/Data/Array/Unboxed.hs lib/base/Data/Function.hs lib/base/Data/Ix.hs jhc-prim-1.0.hl jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +applicative-1.0.hl: lib/applicative/applicative.yaml lib/applicative/Control/Arrow.hs lib/applicative/Control/Applicative.hs lib/applicative/Data/Foldable.hs lib/applicative/Control/Category.hs \ + lib/applicative/Data/Traversable.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +flat-foreign-1.0.hl: lib/flat-foreign/flat-foreign.yaml lib/flat-foreign/StablePtr.hs lib/flat-foreign/MarshalAlloc.hs lib/flat-foreign/CForeign.hs lib/flat-foreign/Storable.hs \ + lib/flat-foreign/Ptr.hs lib/flat-foreign/MarshalArray.hs lib/flat-foreign/Int.hs lib/flat-foreign/CString.hs lib/flat-foreign/Word.hs \ + lib/flat-foreign/CError.hs lib/flat-foreign/CTypes.hs lib/flat-foreign/MarshalError.hs lib/flat-foreign/MarshalUtils.hs lib/flat-foreign/Bits.hs \ + lib/flat-foreign/ForeignPtr.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +haskell98-1.0.hl: lib/haskell98/haskell98.yaml lib/haskell98/System.hs lib/haskell98/List.hs lib/haskell98/Time.hs lib/haskell98/Array.hs \ + lib/haskell98/Random.hs lib/haskell98/Complex.hs lib/haskell98/Locale.hs lib/haskell98/CPUTime.hs lib/haskell98/Ratio.hs \ + lib/haskell98/Monad.hs lib/haskell98/Directory.hs lib/haskell98/IO.hs lib/haskell98/Ix.hs lib/haskell98/Char.hs \ + lib/haskell98/Maybe.hs jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +jhc-1.0.hl: lib/jhc/jhc.yaml lib/jhc/Jhc/Prim.hs lib/jhc/Jhc/IO.hs lib/jhc/Jhc/Int.hs lib/jhc/Jhc/Inst/Enum.hs \ + lib/jhc/Prelude/IO.hs lib/jhc/Jhc/Order.hs lib/jhc/System/C/Stdio.hs lib/jhc/Foreign/C/String.hs lib/jhc/Jhc/Show.hs \ + lib/jhc/Jhc/Handle.hs lib/jhc/Jhc/Addr.hs lib/jhc/Numeric.hs lib/jhc/Jhc/Float.hs lib/jhc/Jhc/Numeric.hs \ + lib/jhc/Jhc/Inst/Storable.hs lib/jhc/Jhc/Inst/Num.hs lib/jhc/Foreign/C/Types.hs lib/jhc/Data/Ratio.hs lib/jhc/Jhc/List.hs \ + lib/jhc/Jhc/Type/Float.hs lib/jhc/Jhc/Class/Num.hs lib/jhc/Foreign/Marshal/Utils.hs lib/jhc/Jhc/Basics.hs lib/jhc/System/Mem.hs \ + lib/jhc/Jhc/Type/Basic.hs lib/jhc/Jhc/ForeignPtr.hs lib/jhc/Jhc/Class/Real.hs lib/jhc/Jhc/Num.hs lib/jhc/Jhc/Text/Read.hs \ + lib/jhc/Jhc/Type/Ptr.hs lib/jhc/Foreign/C/Error.hs lib/jhc/Foreign/Storable.hs lib/jhc/Jhc/Type/Word.hs lib/jhc/Foreign/Ptr.hs \ + lib/jhc/Jhc/Inst/Order.hs lib/jhc/Jhc/Enum.hs lib/jhc/Jhc/Type/Handle.hs lib/jhc/Jhc/Tuples.hs lib/jhc/Jhc/String.hs \ + lib/jhc/Prelude/Float.hs lib/jhc/Jhc/Type/C.hs lib/jhc/Jhc/Class/Ord.hs lib/jhc/Jhc/Inst/PrimEnum.hs lib/jhc/Jhc/Inst/Show.hs \ + lib/jhc/Prelude/Text.hs lib/jhc/Foreign/Marshal/Alloc.hs lib/jhc/Foreign/Marshal/Array.hs lib/jhc/Jhc/Options.hs lib/jhc/Prelude/CType.hs \ + lib/jhc/Jhc/Monad.hs lib/jhc/System/IO/Unsafe.hs lib/jhc/System/Mem/StableName.hs lib/jhc/Jhc/Inst/Read.hs lib/jhc/Jhc/Maybe.hs \ + jhc-prim-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +jhc-prim-1.0.hl: lib/jhc-prim/jhc-prim.yaml lib/jhc-prim/Jhc/Prim/IO.hs lib/jhc-prim/Jhc/Prim/Prim.hs lib/jhc-prim/Jhc/Prim/Array.hs lib/jhc-prim/Jhc/Prim/Wrapper.hs \ + lib/jhc-prim/Jhc/Prim/Rts.hs lib/jhc-prim/Jhc/Prim/Bits.hs + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +haskell2010-0.8.0.hl: lib/haskell2010/haskell2010.yaml.m4 jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + ./jhc $(LIB_OPTIONS) --build-hl $< -o $@ +JHC_LIBS = base-1.0.hl applicative-1.0.hl flat-foreign-1.0.hl haskell98-1.0.hl jhc-1.0.hl \ + jhc-prim-1.0.hl haskell2010-0.8.0.hl +containers-0.3.0.0.hl: lib/ext/containers.cabal jhc-prim-1.0.hl applicative-1.0.hl base-1.0.hl jhc-1.0.hl \ + lib/ext/containers.patch + perl utils/build_extlibs.prl $< +Diff-0.1.2.hl: lib/ext/Diff.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +html-1.0.1.2.hl: lib/ext/html.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +HUnit-1.2.2.1.hl: lib/ext/HUnit.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +parsec-2.1.0.1.hl: lib/ext/parsec.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +pretty-1.0.1.1.hl: lib/ext/pretty.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +QuickCheck-1.2.0.0.hl: lib/ext/QuickCheck.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +safe-0.2.hl: lib/ext/safe.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +smallcheck-0.4.hl: lib/ext/smallcheck.cabal jhc-prim-1.0.hl haskell98-1.0.hl base-1.0.hl jhc-1.0.hl \ + lib/ext/smallcheck.patch + perl utils/build_extlibs.prl $< +xhtml-3000.2.0.1.hl: lib/ext/xhtml.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +transformers-0.2.1.0.hl: lib/ext/transformers.cabal jhc-prim-1.0.hl applicative-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +filepath-1.2.0.0.hl: lib/ext/filepath.cabal jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl + perl utils/build_extlibs.prl $< +deepseq-1.1.0.2.hl: lib/ext/deepseq.cabal jhc-prim-1.0.hl applicative-1.0.hl containers-0.3.0.0.hl base-1.0.hl \ + jhc-1.0.hl + perl utils/build_extlibs.prl $< +bytestring-0.9.2.0.hl: lib/ext/bytestring.yaml jhc-prim-1.0.hl base-1.0.hl jhc-1.0.hl lib/ext/bytestring.patch + perl utils/build_extlibs.prl $< +JHC_EXT_LIBS = containers-0.3.0.0.hl Diff-0.1.2.hl html-1.0.1.2.hl HUnit-1.2.2.1.hl parsec-2.1.0.1.hl \ + pretty-1.0.1.1.hl QuickCheck-1.2.0.0.hl safe-0.2.hl smallcheck-0.4.hl xhtml-3000.2.0.1.hl \ + transformers-0.2.1.0.hl filepath-1.2.0.0.hl deepseq-1.1.0.2.hl bytestring-0.9.2.0.hl hunk ./utils/deps_to_make.prl 31 my @deps; @deps = values %{$y->{ModuleSource}} if !$opt_e; push @deps, values %{$y->{LibraryDeps}} if exists $y->{LibraryDeps}; - @deps = (@{$y->{LibraryDesc}}, @deps) if exists $y->{LibraryDesc}; + if (exists $y->{LibraryDesc}) { + my @ld = @{$y->{LibraryDesc}}; + map { s/^tmp\/build\/[^\/]*/lib\/ext/ } @ld; + @deps = (@ld, @deps); + } map { s/^\.\/// } @deps; foreach (@deps) { my $patch = $_; hunk ./utils/deps_to_make.prl 41 push @deps, $patch if $patch =~ s/\.(cabal|yaml)(.m4)?$/.patch/ and -e $patch; } - push @targets, @{$y->{Target}} if $opt_e; + push @targets, @{$y->{Target}}; for (@{$y->{Target}}) { print "$_:"; pdeps(@deps); hunk ./utils/deps_to_make.prl 46 print "\tperl utils/build_extlibs.prl \$<\n" if $opt_e; + print "\t./jhc \$(LIB_OPTIONS) --build-hl \$< -o \$@\n" if !$opt_e; } } hunk ./utils/deps_to_make.prl 49 -print "JHC_EXT_LIBS =" if @targets; +print ($opt_e ? "JHC_EXT_LIBS =" : "JHC_LIBS =") if @targets; pdeps(@targets) if @targets; Context: [start using Jhc.ForeignPtr John Meacham <[email protected]>**20120307035523 Ignore-this: 4947965ba3de583014a924e498ba5367 ] [remove some files from drift_processed that no longer have DrIFT annotations John Meacham <[email protected]>**20120307020552 Ignore-this: 12c00145035104fbbf869072f3be3569 ] [make Info type ids not depend on the exact format of TypeRep, reduce size of type ids from 32 to 8 bits. John Meacham <[email protected]>**20120307014613 Ignore-this: c2243c0c28122f03a4b869c28a449d8d ] [build_extlibs.prl: correctly check the return status of getstore Roman Cheplyaka <[email protected]>**20120218071732 Ignore-this: 20165069fc8aaa1528969216f7c51435 ] [ghc 7.4 compatibility changes John Meacham <[email protected]>**20120306035643 Ignore-this: c15e182e5a05efb7a623f6386fbb9884 ] [implement finalizers in the RTS, add foreignptr rts routines, properly set saved_gc on safe ffi calls John Meacham <[email protected]>**20120221132313 Ignore-this: 1a27919674abc4a6955c245eec88aaf9 ] [add support for monolithic blocks that are plain malloced memory and can be big. John Meacham <[email protected]>**20120221032043 Ignore-this: 201ba4e67027f3336cfa5e984aefa89 ] [introduce dedicated array allocation routine. clean up jgc garbage collector John Meacham <[email protected]>**20120221011655 Ignore-this: b8e153205aeaf94af76a97b0ee9aa895 ] [make 'div' and 'mod' round to -Infinity properly John Meacham <[email protected]>**20120220094634 Ignore-this: c46b383b9a2a6a63ff44e30a8a63f376 ] [add prototype for gc_alloc John Meacham <[email protected]>**20120220050616 Ignore-this: 444b34148332459dc0e3d32b7c55d3e0 ] [fix deriving rules for read/show when it comes to labels John Meacham <[email protected]>**20120220044322 Ignore-this: 20c9c89ae066716fe3ec8eb4d37c6034 ] [disabled buggy unused transformation in type analysis pass John Meacham <[email protected]>**20120220031442 Ignore-this: 8ad84739daff7f4faff0ba251898ea1a ] [move debugging routines to rts/profile.c John Meacham <[email protected]>**20120217052015 Ignore-this: d2e087faf6e3408dc135fd905d85244b ] [fix rts unit tests John Meacham <[email protected]>**20120217035045 Ignore-this: 460d7eadde056908b668ea27d5a69aa5 ] [export gc_alloc John Meacham <[email protected]>**20120217002235 Ignore-this: dcb70b3ad303f0343147b4e1d6d413b9 ] [Makes the class deriving mechanism more robust: [email protected]**20120216214017 Ignore-this: 6d93691849d255c310b2af7098572ea8 - the names of the classes to be derived may be given qualified. - the functions from the Prelude internally used need not be in scope and won't clash with other bindings. ] [Moved Jhc.List.drop to module Jhc.Basics (since it is used in instance deriving) [email protected]**20120214222939 Ignore-this: f95d4818bad6d79d8fc7566ee0912714 ] [The typechecker now verifies that the main function has a type that can be unified with IO a. This is required by the Haskell 98 Report. [email protected]**20120211050446 Ignore-this: 8a1d8ca36929c0de0fb4357538ea6c5b Failing to do so allows both to accept invalid programs like: > main :: [()] > main = return () and to reject valid programs like: > main = return () ] [Improves the error message shown when a monomorphic pattern has a polymorphic type that cannot be defaulted. [email protected]**20120211045931 Ignore-this: efd70b7535eb0444148aabdbe96ed0b9 The previous error message seemed more like an internal error ("withDefaults.ambiguity: ...") ] [fix for building rts in different modes, profile,debug,windows John Meacham <[email protected]>**20120216201402 Ignore-this: 39b08c82b7239beaeaa6e77a3b986cd4 ] [move rest of rts into seperate c files rather than including it directly. John Meacham <[email protected]>**20120216090215 Ignore-this: d0bf719a38e306f78e182a5c0107573d ] [add pragmaExp to the lexer/parser John Meacham <[email protected]>**20120216044837 Ignore-this: 77393cb5bdd28fba526d57d26ac099b8 ] [update documentation with new extensions John Meacham <[email protected]>**20120214172359 Ignore-this: 2f412f29f20127ce3f97f200674ed8b6 ] [fixes for android John Meacham <[email protected]>**20120213150333 Ignore-this: cf6df59b212e3402ec21507410485270 ] [make += work with '-m' command line options John Meacham <[email protected]>**20120213102300 Ignore-this: 36cb4039cd34ba73d2cc973b7c00798b ] [move jhc_rts_alloc to gc_none John Meacham <[email protected]>**20120213100906 Ignore-this: 1c2e9028d72127acd5a448971266f627 ] [added rts/rts_support, cleaned up rts code. John Meacham <[email protected]>**20120213070644 Ignore-this: 79533860331fbd02057748e3d1b81666 ] [make 'Requires' a simple set, include the calling convention with the requirements. John Meacham <[email protected]>**20120212053838 Ignore-this: b7fa6f8ece79c96073d8638a876456de ] [move slub.c and jhc_jgc.* to rts directory John Meacham <[email protected]>**20120212040246 Ignore-this: a40354544b8908732c733bf8a38e7e68 ] [add unit tests for stableptr John Meacham <[email protected]>**20120212031148 Ignore-this: 17b41baeec806fb53ca2c10c6489097 ] [reorganize rts/ directory, add README for it John Meacham <[email protected]>**20120212022718 Ignore-this: c8a9f067696233958757830b62a7264b ] [add rts/test directory John Meacham <[email protected]>**20120212004706 Ignore-this: 1e6d0cb4ba809a1d6089d04704d5a60f ] [allow being explicit in export/import lists by specifying 'kind', 'class', 'type', or 'data'. add PTS rule to allow proper typing of Complex_ John Meacham <[email protected]>**20120211052157 Ignore-this: 12155286186022f896d3474a2bb5d23a ] [fix Options.hs makefile dependency John Meacham <[email protected]>**20120211024909 Ignore-this: a0742d7ce4eba41314741b6ca2d6498d ] [added user defined kind extension John Meacham <[email protected]>**20120211042248 Ignore-this: ded329985c5c81aa8c4612f7aa19559b ] [Add missing src/Options.hs to jhc tarball Sergei Trofimovich <[email protected]>**20120209065334 Ignore-this: dfc50115ee26986ab2d303a462cd29b9 ] [added mingw32-gcc to MINGW search Sergei Trofimovich <[email protected]>**20110414073938 Ignore-this: 87fa46f0e4532663a9d92930c9c38152 ] [add c-- types for complex and vector values John Meacham <[email protected]>**20120210051026 Ignore-this: 4a1e4c8cec01f73b75913622c22fa55 ] [add documentation for the multi-return ccall extension, clean up code. John Meacham <[email protected]>**20120209201351 Ignore-this: 47504b653ee9f71bde40e91959238292 ] [add extension to allow multiple return values from c functions John Meacham <[email protected]>**20120209142228 Ignore-this: 51e4a3f9ca80ff2eae7f21376f0a0992 ] [fix obscure error message for invalid instance reported by roman John Meacham <[email protected]>**20120209114221 Ignore-this: 98d60e20cb63caaebbe1269887160b9f ] [remove APrim type, use Prim directly, clean up corresponding cruft. John Meacham <[email protected]>**20120209104920 Ignore-this: 8a3fbeea72e7f52809a3468df2b8b228 ] [turn ExtType into a real abstract type John Meacham <[email protected]>**20120209100704 Ignore-this: c802a07fee0f2461cca19aa28f99ff61 ] [add 'capi' foreign function call type, simplify type of E.FromHs monad, check for more FFI related errors John Meacham <[email protected]>**20120209091611 Ignore-this: 1945b5336e6001d6da6cd63a77bd1efd ] [add md5lazyIO, check for bad paths in createTempFile John Meacham <[email protected]>**20120209091527 Ignore-this: f9e5f0dafc9615d5c5c50cb49829c5a5 ] [add foreign types, interpret Ptr when creating external C types John Meacham <[email protected]>**20120209090647 Ignore-this: c49bea3938e2edabda9d7528cfb1121a ] [Add some more exotic primitive ops, ffs,clz,ctz,byteswap,popcount,parity. John Meacham <[email protected]>**20120209070848 Ignore-this: b61b1c08db35ccad33f24536b99913df ] [jhc.spec fixes John Meacham <[email protected]>**20120209015329 Ignore-this: 64488edc34893a734f81b1c01c0b1ff4 ] [TAG 0.8.0 John Meacham <[email protected]>**20120208020026 Ignore-this: 2d0d963331a43650879ae72d81ff62e8 ] Patch bundle hash: 9365fc48ff202394fa91ea87184099b1f95338ee
_______________________________________________ jhc mailing list [email protected] http://www.haskell.org/mailman/listinfo/jhc
