Moving FL case study from a top level topic to a convergence subtopic

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@804 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Jul 8, 2010 · df8b6c8 · df8b6c8
1 parent a4bb5a3
commit df8b6c8
Show file tree

Hide file tree

Showing 28 changed files with 15 additions and 18 deletions.
diff --git a/topics/fl/lci/Makefile → topics/convergence/fl/Makefile b/topics/fl/lci/Makefile → topics/convergence/fl/Makefile
@@ -1,15 +1,14 @@
 tools = ../../../shared/tools
-validator = ${tools}/checkxml
 
 build:
 
 test:
 	${tools}/lci fl.lcf architecture
 
 check:
-	${validator} lcf fl.lcf
-	ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf
-	ls -1  bgf/*.bgf  | xargs -n1 ${validator} bgf
+	${tools}/checkxml lcf fl.lcf
+	ls -1 xbgf/*.xbgf | xargs -n1 ${tools}/checkxml xbgf
+	ls -1  bgf/*.bgf  | xargs -n1 ${tools}/checkxml bgf
 
 clean:
 	rm -f *~

diff --git a/topics/fl/lci/fl-lci.csproj → topics/convergence/fl/fl-lci.csproj b/topics/fl/lci/fl-lci.csproj → topics/convergence/fl/fl-lci.csproj
diff --git a/topics/fl/lci/fl-lci.sln → topics/convergence/fl/fl-lci.sln b/topics/fl/lci/fl-lci.sln → topics/convergence/fl/fl-lci.sln
diff --git a/topics/fl/lci/fl.lcf → topics/convergence/fl/fl.lcf b/topics/fl/lci/fl.lcf → topics/convergence/fl/fl.lcf
@@ -7,7 +7,7 @@
   </shortcut>
   <shortcut>
     <name>fl</name>
-    <expansion>..</expansion>
+    <expansion>../../fl</expansion>
   </shortcut>
   <shortcut>
     <name>tools</name>

diff --git a/...cs/fl/lci/snapshot/architecture_large.pdf → ...rgence/fl/snapshot/architecture_large.pdf b/...cs/fl/lci/snapshot/architecture_large.pdf → ...rgence/fl/snapshot/architecture_large.pdf
diff --git a/...cs/fl/lci/snapshot/architecture_small.pdf → ...rgence/fl/snapshot/architecture_small.pdf b/...cs/fl/lci/snapshot/architecture_small.pdf → ...rgence/fl/snapshot/architecture_small.pdf
diff --git a/topics/fl/lci/xbgf/defineLex.xbgf → topics/convergence/fl/xbgf/defineLex.xbgf b/topics/fl/lci/xbgf/defineLex.xbgf → topics/convergence/fl/xbgf/defineLex.xbgf
diff --git a/topics/fl/lci/xbgf/designateOps.xbgf → topics/convergence/fl/xbgf/designateOps.xbgf b/topics/fl/lci/xbgf/designateOps.xbgf → topics/convergence/fl/xbgf/designateOps.xbgf
diff --git a/topics/fl/lci/xbgf/extractOps.xbgf → topics/convergence/fl/xbgf/extractOps.xbgf b/topics/fl/lci/xbgf/extractOps.xbgf → topics/convergence/fl/xbgf/extractOps.xbgf
diff --git a/topics/fl/lci/xbgf/makeSignature.xbgf → ...cs/convergence/fl/xbgf/makeSignature.xbgf b/topics/fl/lci/xbgf/makeSignature.xbgf → ...cs/convergence/fl/xbgf/makeSignature.xbgf
diff --git a/topics/fl/lci/xbgf/massage-model.xbgf → ...cs/convergence/fl/xbgf/massage-model.xbgf b/topics/fl/lci/xbgf/massage-model.xbgf → ...cs/convergence/fl/xbgf/massage-model.xbgf
diff --git a/topics/fl/lci/xbgf/multipleNewlines.xbgf → ...convergence/fl/xbgf/multipleNewlines.xbgf b/topics/fl/lci/xbgf/multipleNewlines.xbgf → ...convergence/fl/xbgf/multipleNewlines.xbgf
diff --git a/topics/fl/lci/xbgf/permuteArgs.xbgf → topics/convergence/fl/xbgf/permuteArgs.xbgf b/topics/fl/lci/xbgf/permuteArgs.xbgf → topics/convergence/fl/xbgf/permuteArgs.xbgf
diff --git a/topics/fl/lci/xbgf/preferDcg.xbgf → topics/convergence/fl/xbgf/preferDcg.xbgf b/topics/fl/lci/xbgf/preferDcg.xbgf → topics/convergence/fl/xbgf/preferDcg.xbgf
diff --git a/topics/fl/lci/xbgf/preferJaxb.xbgf → topics/convergence/fl/xbgf/preferJaxb.xbgf b/topics/fl/lci/xbgf/preferJaxb.xbgf → topics/convergence/fl/xbgf/preferJaxb.xbgf
diff --git a/topics/fl/lci/xbgf/preferSdf.xbgf → topics/convergence/fl/xbgf/preferSdf.xbgf b/topics/fl/lci/xbgf/preferSdf.xbgf → topics/convergence/fl/xbgf/preferSdf.xbgf
diff --git a/topics/fl/lci/xbgf/removeLayers.xbgf → topics/convergence/fl/xbgf/removeLayers.xbgf b/topics/fl/lci/xbgf/removeLayers.xbgf → topics/convergence/fl/xbgf/removeLayers.xbgf
diff --git a/topics/fl/lci/xbgf/rename-antlr.xbgf → topics/convergence/fl/xbgf/rename-antlr.xbgf b/topics/fl/lci/xbgf/rename-antlr.xbgf → topics/convergence/fl/xbgf/rename-antlr.xbgf
diff --git a/topics/fl/lci/xbgf/rename-ecore.xbgf → topics/convergence/fl/xbgf/rename-ecore.xbgf b/topics/fl/lci/xbgf/rename-ecore.xbgf → topics/convergence/fl/xbgf/rename-ecore.xbgf
diff --git a/topics/fl/lci/xbgf/rename-emf.xbgf → topics/convergence/fl/xbgf/rename-emf.xbgf b/topics/fl/lci/xbgf/rename-emf.xbgf → topics/convergence/fl/xbgf/rename-emf.xbgf
diff --git a/topics/fl/lci/xbgf/rename-txl.xbgf → topics/convergence/fl/xbgf/rename-txl.xbgf b/topics/fl/lci/xbgf/rename-txl.xbgf → topics/convergence/fl/xbgf/rename-txl.xbgf
diff --git a/topics/fl/lci/xbgf/resolveAggregation.xbgf → ...nvergence/fl/xbgf/resolveAggregation.xbgf b/topics/fl/lci/xbgf/resolveAggregation.xbgf → ...nvergence/fl/xbgf/resolveAggregation.xbgf
diff --git a/topics/fl/lci/xbgf/stripNewline.xbgf → topics/convergence/fl/xbgf/stripNewline.xbgf b/topics/fl/lci/xbgf/stripNewline.xbgf → topics/convergence/fl/xbgf/stripNewline.xbgf
diff --git a/topics/fl/lci/xbgf/trim-jaxb.xbgf → topics/convergence/fl/xbgf/trim-jaxb.xbgf b/topics/fl/lci/xbgf/trim-jaxb.xbgf → topics/convergence/fl/xbgf/trim-jaxb.xbgf
diff --git a/topics/fl/lci/xbgf/trim-om.xbgf → topics/convergence/fl/xbgf/trim-om.xbgf b/topics/fl/lci/xbgf/trim-om.xbgf → topics/convergence/fl/xbgf/trim-om.xbgf
diff --git a/topics/fl/lci/xbgf/trim-xsd.xbgf → topics/convergence/fl/xbgf/trim-xsd.xbgf b/topics/fl/lci/xbgf/trim-xsd.xbgf → topics/convergence/fl/xbgf/trim-xsd.xbgf
diff --git a/topics/fl/lci/xbgf/unerase.xbgf → topics/convergence/fl/xbgf/unerase.xbgf b/topics/fl/lci/xbgf/unerase.xbgf → topics/convergence/fl/xbgf/unerase.xbgf
diff --git a/topics/convergence/java/Makefile b/topics/convergence/java/Makefile
@@ -1,24 +1,22 @@
-validator     = ../../../shared/tools/checkxml
-prettyprinter = ../../../shared/tools/bgf2bnf
-framework     = ../../../shared/tools/lci
+tools = ../../../shared/tools
 
 build:
 
 test:
-	${framework} java.lcf architecture
+	${tools}/lci java.lcf architecture
 
 check:
-	${validator} lcf java.lcf
-	ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf
-	ls -1  bgf/*.bgf  | xargs -n1 ${validator} bgf
+	${tools}/checkxml lcf java.lcf
+	ls -1 xbgf/*.xbgf | xargs -n1 ${tools}/checkxml xbgf
+	ls -1  bgf/*.bgf  | xargs -n1 ${tools}/checkxml bgf
 
 debug:
-	${prettyprinter} snapshot/impl1.bgf 1.bnf
-	${prettyprinter} snapshot/impl2.bgf 2.bnf
-	${prettyprinter} snapshot/impl3.bgf 3.bnf
-	${prettyprinter} snapshot/read1.bgf q.bnf
-	${prettyprinter} snapshot/read2.bgf w.bnf
-	${prettyprinter} snapshot/read3.bgf e.bnf
+	${tools}/bgf2bnf snapshot/impl1.bgf 1.bnf
+	${tools}/bgf2bnf snapshot/impl2.bgf 2.bnf
+	${tools}/bgf2bnf snapshot/impl3.bgf 3.bnf
+	${tools}/bgf2bnf snapshot/read1.bgf q.bnf
+	${tools}/bgf2bnf snapshot/read2.bgf w.bnf
+	${tools}/bgf2bnf snapshot/read3.bgf e.bnf
 
 clean:
 	rm -f *~