moving generated scenarios of convergence

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@806 ab42f6e0-554d-0410-b580-99e487e6eeb2

topics/fl/lci-sliced/Makefile → topics/convergence/fl-sliced/Makefile

@@ -6,7 +6,7 @@ build:
 	time make csv
 
 slice:
-	../../../shared/python/sliceXbgfs.py ../lci/fl.lcf .
+	../../../shared/python/sliceXbgfs.py ../fl/fl.lcf .
 
 test:
 	../../../shared/tools/lci fl.lcf architecture

topics/fl/lci-sliced/fl.lcf → topics/convergence/fl-sliced/fl.lcf

@@ -4,7 +4,7 @@
   </shortcut>
   <shortcut>
     <name>fl</name>
-    <expansion>..</expansion>
+    <expansion>../../fl</expansion>
   </shortcut>
   <shortcut>
     <name>tools</name>

topics/java/lci-sliced/Makefile → topics/convergence/java-sliced/Makefile

@@ -6,7 +6,7 @@ build:
 	time make csv
 
 slice:
-	../../../shared/python/sliceXbgfs.py ../lci/java.lcf .
+	../../../shared/python/sliceXbgfs.py ../java/java.lcf .
 
 test:
 	../../../shared/tools/lci java.lcf architecture

topics/grammars/java/Makefile

@@ -3,6 +3,17 @@ build:
 	cd jls2 && make build
 	cd jls3 && make build
 
+help:
+	@echo "Run 'make rebuild' if you want to renew the sources from their URLs."
+	@echo NOT recommended UNLESS you really know what you are doing!
+	@echo "Run 'make debug' to execute all extractors in debug mode"
+	@echo "Run 'make test' to execute all extractors and diff the results with LCI snapshot"
+
+debug:
+	cd jls1 ; make debug
+	cd jls2 ; make debug
+	cd jls3 ; make debug
+
 clean:
 	cd jls1 && make clean
 	cd jls2 && make clean
@@ -12,3 +23,38 @@ test:
 	cd jls1 && make test
 	cd jls2 && make test
 	cd jls3 && make test
+	../../../shared/tools/gdts jls1/impl1.bgf ../../convergence/java/snapshot/impl1.bgf
+	../../../shared/tools/gdts jls2/impl2.bgf ../../convergence/java/snapshot/impl2.bgf
+	../../../shared/tools/gdts jls3/impl3.bgf ../../convergence/java/snapshot/impl3.bgf
+	../../../shared/tools/gdts jls1/read1.bgf ../../convergence/java/snapshot/read1.bgf
+	../../../shared/tools/gdts jls2/read2.bgf ../../convergence/java/snapshot/read2.bgf
+	../../../shared/tools/gdts jls3/read3.bgf ../../convergence/java/snapshot/read3.bgf
+
+rebuild:
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/19.doc.html > jls1/impl.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/syntax.doc.html > jls2/impl.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/syntax.html > jls3/impl.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/4.doc.html   >jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/6.doc.html  >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/7.doc.html  >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/8.doc.html  >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/9.doc.html  >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/10.doc.html >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/14.doc.html >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/first_edition/html/15.doc.html >>jls1/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/typesValues.doc.html >jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/names.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/packages.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/classes.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/interfaces.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/arrays.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/statements.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/second_edition/html/expressions.doc.html >>jls2/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html >jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/names.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/packages.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/classes.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/interfaces.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/arrays.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/statements.html >>jls3/read.html
+	curl -k http://java.sun.com/docs/books/jls/third_edition/html/expressions.html >>jls3/read.html

topics/grammars/java/jls1/Makefile

@@ -25,8 +25,8 @@ read:
 test:
 	../../../../shared/tools/checkxml bgf impl1.bgf
 	../../../../shared/tools/checkxml bgf read1.bgf
-	../../../../shared/tools/gdt impl1.bgf extracted-implementable-grammar.bgf
-	../../../../shared/tools/gdt read1.bgf extracted-readable-grammar.bgf
+	../../../../shared/tools/gdts impl1.bgf extracted-implementable-grammar.bgf
+	../../../../shared/tools/gdts read1.bgf extracted-readable-grammar.bgf
 
 clean:
 	rm -f *.bgf parse.html

topics/grammars/java/jls2/Makefile

@@ -23,8 +23,8 @@ read:
 test:
 	../../../../shared/tools/checkxml bgf impl2.bgf
 	../../../../shared/tools/checkxml bgf read2.bgf
-	../../../../shared/tools/gdt impl2.bgf extracted-implementable-grammar.bgf
-	../../../../shared/tools/gdt read2.bgf extracted-readable-grammar.bgf
+	../../../../shared/tools/gdts impl2.bgf extracted-implementable-grammar.bgf
+	../../../../shared/tools/gdts read2.bgf extracted-readable-grammar.bgf
 
 clean:
 	rm -f *.bgf parse.html

topics/grammars/java/jls3/Makefile

@@ -23,8 +23,8 @@ read:
 test:
 	../../../../shared/tools/checkxml bgf impl3.bgf
 	../../../../shared/tools/checkxml bgf read3.bgf
-	../../../../shared/tools/gdt impl3.bgf extracted-implementable-grammar.bgf
-	../../../../shared/tools/gdt read3.bgf extracted-readable-grammar.bgf
+	../../../../shared/tools/gdts impl3.bgf extracted-implementable-grammar.bgf
+	../../../../shared/tools/gdts read3.bgf extracted-readable-grammar.bgf
 
 clean:
 	rm -f *.bgf parse.html