Commit 39bb0b36 authored by Akim Demaille's avatar Akim Demaille
Browse files

2003-03-18 Akim Demaille <akim@epita.fr>

	Support distcheck.

	Version 0.12.

	* configure.ac, Makefile.am, config/Makefile, src/Makefile.am,
	* src/Config.hs.in: New.
	* src/Opt.hs: Use it.
parent 7c1b0382
2003-03-18 Akim Demaille <akim@epita.fr>
Support distcheck.
Version 0.12.
* configure.ac, Makefile.am, config/Makefile, src/Makefile.am,
* src/Config.hs.in: New.
* src/Opt.hs: Use it.
2003-03-06 Akim Demaille <akim@epita.fr>
* src/Scan.hs (escapeToChar): New.
......
# Copyright (C) 2003 Robert Anisko
#
# This file is part of HAVM. This program is free software; you can
# redistribute it and/or modify it under the terms of the GNU General
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
SUBDIRS = config src
# Copyright (C) 2003 Robert Anisko
#
# This file is part of HAVM. This program is free software; you can
# redistribute it and/or modify it under the terms of the GNU General
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
# Copyright (C) 2003 Robert Anisko
#
# This file is part of HAVM. This program is free software; you can
# redistribute it and/or modify it under the terms of the GNU General
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
AC_PREREQ(2.57)
AC_INIT(HAVM, 0.12, anisko_r@epita.fr)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([foreign 1.7.3])
AC_CONFIG_FILES(Makefile config/Makefile src/Config.hs src/Makefile)
AC_OUTPUT
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "Haskell VM for Tiger")
(Project-Version havm 0 59)
(Parent-Version havm 0 58)
(Version-Log "2003-03-06 Akim Demaille <akim@epita.fr>
(Project-Version havm 0 60)
(Parent-Version havm 0 59)
(Version-Log "2003-03-18 Akim Demaille <akim@epita.fr>
* src/Scan.hs (escapeToChar): New.
(scanLiteralContent): Support all the ISO C symbolic .")
Support distcheck.
Version 0.12.
* configure.ac, Makefile.am, config/Makefile, src/Makefile.am,
* src/Config.hs.in: New.
* src/Opt.hs: Use it.")
(New-Version-Log "")
(Checkin-Time "Thu, 06 Mar 2003 10:22:39 +0100")
(Checkin-Time "Tue, 18 Mar 2003 09:26:42 +0100")
(Checkin-Login akim)
(Populate-Ignore ("~$" "\\.\\(o\\|hi\\)$"))
(Populate-Ignore
(
"~$"
"\\.\\(hi\\|o\\|log\\|patch\\)$"
"^config/\\(config.guess\\|config.sub\\|depcomp\\|install-sh\\|missing\\|mkinstalldirs\\)$"
"^havm-"
"aclocal\\.m4"
"autom4te.cache"
"Makefile\\(.in\\)\\?$"
"\\(configure\\|config.status\\)$"
"src/\\(Config\\|Parse\\)\\.hs$"
"src/havm$"
)
)
(Project-Keywords)
(Files
(ChangeLog (havm/0_ChangeLog 1.59 644))
(prj (havm.prj) :symlink)
(ChangeLog (havm/0_ChangeLog 1.60 644))
(configure.ac (havm/34_configure. 1.1 644))
(Makefile.am (havm/35_Makefile.a 1.1 644))
(config/Makefile.am (havm/36_Makefile.a 1.1 644))
(src/Annotation.hs (havm/21_Annotation 1.2 644))
(src/Code.hs (havm/1_Code.hs 1.3 644))
......@@ -28,7 +50,8 @@
(src/Main.hs (havm/5_Main.hs 1.20 644))
(src/Memory.hs (havm/6_Memory.hs 1.5 644))
(src/Monad.hs (havm/7_Monad.hs 1.11 644))
(src/Opt.hs (havm/17_Opt.hs 1.15 644))
(src/Config.hs.in (havm/37_Config.hs. 1.1 644))
(src/Opt.hs (havm/17_Opt.hs 1.16 644))
(src/Parse.y (havm/8_Parse.y 1.7 644))
(src/Plain.hs (havm/22_Plain.hs 1.2 644))
(src/Position.hs (havm/19_Position.h 1.1 644))
......@@ -50,7 +73,7 @@
(src/Token.hs (havm/15_Token.hs 1.5 644))
(src/Trace.hs (havm/30_Trace.hs 1.1 644))
(src/Makefile (havm/16_Makefile 1.4 644))
(src/Makefile.am (havm/16_Makefile 1.5 644))
)
(Merge-Parents)
(New-Merge-Parents)
module Config (package_version, -- -*- Haskell -*-
package_string)
where
package_version = "@PACKAGE_VERSION@"
package_string = "@PACKAGE_STRING@"
.SUFFIXES:
all: Parse.hs
ghc --make -package data Main.hs -o havm
bsd: Parse.hs
ghc --make -package data -optl "-static" Main.hs -o havm
profile: Parse.hs
ghc --make -package data -prof -auto-all Main.hs -o havm
clean:
rm -f *~
rm -f *.c
rm -f *.o
rm -f *.hi
rm -f *.hc
fclean: clean
rm -f havm
rm -f Parse.hs
%.hs: %.y
happy $<
%.hc: %.hs
ghc -C -package data $< -o $@
%.c: %.hc
mv $< $@
# Copyright (C) 2003 Robert Anisko
#
# This file is part of HAVM. This program is free software; you can
# redistribute it and/or modify it under the terms of the GNU General
# Public License version 2 as published by the Free Software
# Foundation.
#
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
HC = ghc
HAPPY = happy
SUFFIXES = .hs .y .hc
dist_noinst_DATA = \
Annotation.hs Low.hs Position.hs Runtime.hs StdBinop.hs \
Code.hs Main.hs Preload.hs RuntimeInput.hs StdRelop.hs \
Cpu.hs Memory.hs Print.hs RuntimeInt.hs Token.hs \
Eval.hs Monad.hs Profile.hs RuntimePrint.hs Trace.hs \
Ir.hs Opt.hs Report.hs RuntimeString.hs \
Level.hs Parse.y Result.hs RuntimeSystem.hs \
Location.hs Plain.hs RuntimeChar.hs Scan.hs
bin_PROGRAM = havm
# -odir
#
# Non-interface output files are normally put in the same directory
# as their corresponding input file came from. You may specify that
# they be put in another directory using the -odir <dir> (the "Oh,
# dear" option). For example:
#
# % ghc -c parse/Foo.hs parse/Bar.hs gurgle/Bumble.hs -odir `arch`
#
# The output files, Foo.o, Bar.o, and Bumble.o would be put into a
# subdirectory named after the architecture of the executing machine
# (sun4, mips, etc). The directory must already exist; it won't be
# created.
#
# Note that the -odir option does not affect where the interface
# files are put. In the above example, they would still be put in
# parse/Foo.hi, parse/Bar.hi, and gurgle/Bumble.hi.
#
# -hidir directory
#
# Redirects all generated interface files into directory, instead of
# the default which is to place the interface file in the same
# directory as the source file.
havm: Parse.hs
$(HC) -i.:$(srcdir) -odir. -hidir. --make -package data $(srcdir)/Main.hs -o havm
bsd: Parse.hs
$(HC) --make -package data -optl "-static" Main.hs -o havm
profile: Parse.hs
$(HC) --make -package data -prof -auto-all Main.hs -o havm
CLEANFILES = *.hi *.hc *.o Parse.hs
fclean: clean
rm -f havm
rm -f Parse.hs
.y.hs:
$(HAPPY) $< -o $@
.hs.hc:
$(HC) -C -package data $< -o $@
.hc.c:
mv $< $@
module Opt (opt)
where
import Config (package_string)
import GetOpt
import FiniteMap (FiniteMap, emptyFM, addToFM)
......@@ -20,7 +21,6 @@ instance Eq Flag where
(==) _ _ = False
header = "Usage: havm [OPTIONS] INPUT-FILE"
version = "havm 0.11"
options :: [OptDescr Flag]
options = [Option ['h'] ["help"] (NoArg Help) "display this help and exit",
......@@ -43,7 +43,7 @@ process (opts, args)
do putStr $ usageInfo header options
return (emptyFM, Nothing)
| Version `elem` opts =
do putStrLn $ version
do putStrLn $ package_string
return (emptyFM, Nothing)
| (length args) == 1 =
return $ (extract opts emptyFM, Just $ head args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment