Oops, fixed sub project definition (causing endless recursion during build)
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 11 May 2015 12:19:13 +0100
changeset 456 59a88a51f46a
parent 455 44208dab727c
child 457 76de2febe7d2
Oops, fixed sub project definition (causing endless recursion during build)
Make.proto
bmake.bat
islands/abbrev.stc
lccmake.bat
mingwmake.bat
vcmake.bat
--- a/Make.proto	Sun May 10 14:42:14 2015 +0100
+++ b/Make.proto	Mon May 11 12:19:13 2015 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= analyzer parser/smalltalk parser/java compiler
+SUBDIRS= analyzer tests parsers/smalltalk parsers/java compiler
 
 
 # subdirectories where Makefiles are to be made:
--- a/bmake.bat	Sun May 10 14:42:14 2015 +0100
+++ b/bmake.bat	Mon May 11 12:19:13 2015 +0100
@@ -17,16 +17,23 @@
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "Buildung stx/goodies/petitparser/tests
 @echo "***********************************"
-@pushd parser\smalltalk
+@pushd tests
 @call bmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
 @echo "***********************************"
-@pushd parser\java
+@pushd parsers\smalltalk
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parsers/java
+@echo "***********************************"
+@pushd parsers\java
 @call bmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
@@ -36,3 +43,5 @@
 @pushd compiler
 @call bmake %1 %2 || exit /b "%errorlevel%"
 @popd
+
+
--- a/islands/abbrev.stc	Sun May 10 14:42:14 2015 +0100
+++ b/islands/abbrev.stc	Mon May 11 12:19:13 2015 +0100
@@ -8,5 +8,5 @@
 stx_goodies_petitparser_islands stx_goodies_petitparser_islands stx:goodies/petitparser/islands '* Projects & Packages *' 3
 PPMemoizingIsland PPMemoizingIsland stx:goodies/petitparser/islands 'PetitIslands-Parsers' 0
 JavaParser JavaParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
+XmlFeedParser XmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
 RobustXmlFeedParser RobustXmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
-XmlFeedParser XmlFeedParser stx:goodies/petitparser/islands 'PetitIslands-Examples' 0
--- a/lccmake.bat	Sun May 10 14:42:14 2015 +0100
+++ b/lccmake.bat	Mon May 11 12:19:13 2015 +0100
@@ -20,16 +20,16 @@
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
 @echo "***********************************"
-@pushd parser\smalltalk
+@pushd parsers\smalltalk
 @call lccmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
 @echo "***********************************"
-@pushd parser\java
+@pushd parsers\java
 @call lccmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
@@ -40,11 +40,4 @@
 @call lccmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
-@echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/compiler/tests
-@echo "***********************************"
-@pushd compiler\tests
-@call lccmake %1 %2 || exit /b "%errorlevel%"
-@popd
 
-
--- a/mingwmake.bat	Sun May 10 14:42:14 2015 +0100
+++ b/mingwmake.bat	Mon May 11 12:19:13 2015 +0100
@@ -28,16 +28,16 @@
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
 @echo "***********************************"
-@pushd parser\smalltalk
+@pushd parsers\smalltalk
 @call mingwmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
 @echo "***********************************"
-@pushd parser\java
+@pushd parsers\java
 @call mingwmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
@@ -48,11 +48,4 @@
 @call mingwmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
-@echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/compiler/tests
-@echo "***********************************"
-@pushd compiler\tests
-@call mingwmake %1 %2 || exit /b "%errorlevel%"
-@popd
 
-
--- a/vcmake.bat	Sun May 10 14:42:14 2015 +0100
+++ b/vcmake.bat	Mon May 11 12:19:13 2015 +0100
@@ -32,16 +32,16 @@
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
 @echo "***********************************"
-@pushd parser\smalltalk
+@pushd parsers\smalltalk
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
 @echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
 @echo "***********************************"
-@pushd parser\java
+@pushd parsers\java
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
@@ -52,11 +52,4 @@
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
-@echo "***********************************"
-@echo "Buildung stx/goodies/petitparser/compiler/tests
-@echo "***********************************"
-@pushd compiler\tests
-@call vcmake %1 %2 || exit /b "%errorlevel%"
-@popd
 
-