suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a library path to the set of Tock directories

Browse Source
This commit is contained in:
Neil Brown 2009-04-04 15:57:50 +00:00
parent 8400de520b
commit f8103c1d2d
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Main.hs
View File

@ -74,6 +74,7 @@ optionsNoWarnings =
, Option [] ["run-indent"] (NoArg $ optRunIndent) "run indent on source before compilation (will full mode)" , Option [] ["run-indent"] (NoArg $ optRunIndent) "run indent on source before compilation (will full mode)"
, Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam, rain)" , Option [] ["frontend"] (ReqArg optFrontend "FRONTEND") "language frontend (options: occam, rain)"
, Option [] ["include-path"] (NoArg $ optPrintPath tockIncludeDir) "print include path" , Option [] ["include-path"] (NoArg $ optPrintPath tockIncludeDir) "print include path"
, Option [] ["lib-path"] (NoArg $ optPrintPath tockLibDir) "print lib path"
, Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: flowgraph, lex, html, parse, compile, post-c, full)" , Option [] ["mode"] (ReqArg optMode "MODE") "select mode (options: flowgraph, lex, html, parse, compile, post-c, full)"
, Option [] ["module-path"] (NoArg $ optPrintPath tockModuleDir) "print module path" , Option [] ["module-path"] (NoArg $ optPrintPath tockModuleDir) "print module path"
, Option ['c'] ["no-main"] (NoArg optNoMain) "file has no main process; do not link either" , Option ['c'] ["no-main"] (NoArg optNoMain) "file has no main process; do not link either"

5
Makefile.am
View File

@ -96,14 +96,17 @@ endif
TOCKDIR=$(DATADIR)/tock TOCKDIR=$(DATADIR)/tock
TOCKMODDIR=$(TOCKDIR)/modules TOCKMODDIR=$(TOCKDIR)/modules
TOCKINCDIR=$(TOCKDIR)/include TOCKINCDIR=$(TOCKDIR)/include
TOCKLIBDIR=$(TOCKDIR)/lib
modulesdir=$(TOCKMODDIR) modulesdir=$(TOCKMODDIR)
tockincdir=$(TOCKINCDIR) tockincdir=$(TOCKINCDIR)
tocklibdir=$(TOCKLIBDIR)
config/Paths.hs: config/Paths.hs.in config/Paths.hs: config/Paths.hs.in
@sed -e 's,@@pkgincludedir@@,$(pkgincludedir),g' config/Paths.hs.in \ @sed -e 's,@@pkgincludedir@@,$(pkgincludedir),g' config/Paths.hs.in \
| sed -e 's,@@tockdir@@,$(TOCKDIR),g' \ | sed -e 's,@@tockdir@@,$(TOCKDIR),g' \
| sed -e 's,@@tockmoddir@@,$(TOCKMODDIR),g' \ | sed -e 's,@@tockmoddir@@,$(TOCKMODDIR),g' \
| sed -e 's,@@tockincdir@@,$(TOCKINCDIR),g' >config/Paths.hs | sed -e 's,@@tockincdir@@,$(TOCKINCDIR),g' \
| sed -e 's,@@tocklibdir@@,$(TOCKLIBDIR),g' >config/Paths.hs
data/NavAST.hs: GenNavAST$(EXEEXT) data/NavAST.hs: GenNavAST$(EXEEXT)
./GenNavAST$(EXEEXT) > data/NavAST.hs ./GenNavAST$(EXEEXT) > data/NavAST.hs

3
config/Paths.hs.in
View File

@ -15,3 +15,6 @@ tockModuleDir = "@@tockmoddir@@"
tockIncludeDir :: String tockIncludeDir :: String
tockIncludeDir = "@@tockincdir@@" tockIncludeDir = "@@tockincdir@@"
tockLibDir :: String
tockLibDir = "@@tocklibdir@@"