Permalink
Browse files

src/ dir reorg

  • Loading branch information...
1 parent eb78113 commit 3e4134379eaf29b3f2fe5b6f92d79a8c703a060c @dsheets committed Mar 15, 2012
View
2 _oasis
@@ -8,5 +8,5 @@ License: BSD3
Executable gloc
Path: .
BuildTools: ocamlbuild
- MainIs: gloc_posix.ml
+ MainIs: src/gloc_posix.ml
@@ -1,2 +1,3 @@
*~
*.annot
+_build/
View
@@ -3,25 +3,27 @@
RM_ANNOT=rm -f *.annot
OCAMLBUILD=ocamlbuild -use-ocamlfind -cflag -annot
CP_ANNOT=cp _build/*.annot .
+GLOCODE=../doc/glocode
+CODEMIRROR=../CodeMirror2
all: gloc.d.byte glol_js.d.js gloc_js.d.js
glocode: gloc_xml.d.byte
- rm -rf glocode/
- mkdir -p glocode/
- ./gloc_xml.d.byte | xsltproc - > glocode/index.html
- rm -rf glocode/CodeMirror2
- mkdir -p glocode/CodeMirror2/lib
- mkdir -p glocode/CodeMirror2/mode
- mkdir -p glocode/CodeMirror2/keymap
- cp -R CodeMirror2/lib glocode/CodeMirror2/
- cp -R CodeMirror2/mode glocode/CodeMirror2/
- cp -R CodeMirror2/keymap glocode/CodeMirror2/
- cp gloc.css glocode/
- cp gloc_platform_js.js glocode/
- mkdir -p glocode/_build/
+ rm -rf ${GLOCODE}
+ mkdir -p ${GLOCODE}
+ ./gloc_xml.d.byte | xsltproc - > ${GLOCODE}/index.html
+ rm -rf ${GLOCODE}/CodeMirror2
+ mkdir -p ${GLOCODE}/CodeMirror2/lib
+ mkdir -p ${GLOCODE}/CodeMirror2/mode
+ mkdir -p ${GLOCODE}/CodeMirror2/keymap
+ cp -R ${CODEMIRROR}/lib ${GLOCODE}/CodeMirror2/
+ cp -R ${CODEMIRROR}/mode ${GLOCODE}/CodeMirror2/
+ cp -R ${CODEMIRROR}/keymap ${GLOCODE}/CodeMirror2/
+ cp gloc.css ${GLOCODE}/
+ cp gloc_platform_js.js ${GLOCODE}/
+ mkdir -p ${GLOCODE}/_build/
make gloc_js.d.js
- cp _build/gloc_js.d.js glocode/_build/
+ cp _build/gloc_js.d.js ${GLOCODE}/_build/
gloc_js.d.js:
${RM_ANNOT}
View
@@ -8,7 +8,7 @@
<gloc_xml.*>: package(atdgen), package(ulex), package(menhirLib), package(re.str)
<gloc_lib.*>: package(atdgen), package(re.str)
<glol.*>: package(atdgen), package(re.str)
-<glol_js.*>: syntax(camlp4o), package(js_of_ocaml), package(js_of_ocaml.syntax), package(re.str), package(atdgen)
+<glol_js.*>: syntax(camlp4o), package(js_of_ocaml), package(js_of_ocaml.syntax), package(re.str), package(atdgen), package(ulex), package(menhirLib)
<glo_*>: package(atdgen)
<glo.*>: package(atdgen), package(re.str)
<glo_lib.*>: package(re.str), package(ulex), package(menhirLib)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte -c -v --dissolve
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte -c -v --dissolve
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte -e
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte -e
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)
View
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)
View
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte -c -v
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte -c -v
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)
View
@@ -1,4 +1,4 @@
-GLOC = OCAMLRUNPARAM=b ../../../gloc.d.byte
+GLOC = OCAMLRUNPARAM=b ../../../src/gloc.d.byte
ARGSETS := $(wildcard *.argset)
ARGSYMS := $(ARGSETS:.argset=.argsym)
@@ -7,11 +7,11 @@
return function(name,fn) { m[name] = fn; };
})(ocaml);
</script>
- <script type="text/javascript" src="../../../glol.js"></script>
- <script type="text/javascript" src="../../../glol_js.d.js"></script>
+ <script type="text/javascript" src="../../../src/glol.js"></script>
+ <script type="text/javascript" src="../../../src/_build/glol_js.d.js"></script>
<script type="text/javascript" src="../../../Pretty-Diff/prettydiff.js"></script>
<script type="text/javascript" src="test_glol.js"></script>
- <link rel="stylesheet" href="../../../gloc.css" type="text/css" />
+ <link rel="stylesheet" href="../../../src/gloc.css" type="text/css" />
</head>
<body>
<tests />
View
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte -E
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte -E
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)
View
@@ -1,4 +1,4 @@
-PP = OCAMLRUNPARAM=b ../../../gloc.d.byte -e
+PP = OCAMLRUNPARAM=b ../../../src/gloc.d.byte -e
INS := $(wildcard *.in)
OUTS := $(INS:.in=.out)

0 comments on commit 3e41343

Please sign in to comment.