--- a/Make.proto Wed Jun 03 08:48:59 2015 +0100
+++ b/Make.proto Wed Jun 03 09:06:49 2015 +0100
@@ -21,7 +21,7 @@
INCLUDE_TOP=$(TOP)/..
# subdirectories where targets are to be made:
-SUBDIRS= analyzer tests ../parsers/smalltalk ../parsers/java ../compiler
+SUBDIRS= analyzer tests parsers/smalltalk parsers/java compiler
# subdirectories where Makefiles are to be made:
--- a/bmake.bat Wed Jun 03 08:48:59 2015 +0100
+++ b/bmake.bat Wed Jun 03 09:06:49 2015 +0100
@@ -24,23 +24,23 @@
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
@echo "***********************************"
-@pushd ..\parsers\smalltalk
+@pushd parsers\smalltalk
@call bmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
@echo "***********************************"
-@pushd ..\parsers\java
+@pushd parsers\java
@call bmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/compiler
+@echo "Buildung stx/goodies/petitparser/compiler
@echo "***********************************"
-@pushd ..\compiler
+@pushd compiler
@call bmake %1 %2 || exit /b "%errorlevel%"
@popd
--- a/lccmake.bat Wed Jun 03 08:48:59 2015 +0100
+++ b/lccmake.bat Wed Jun 03 09:06:49 2015 +0100
@@ -20,23 +20,23 @@
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
@echo "***********************************"
-@pushd ..\parsers\smalltalk
+@pushd parsers\smalltalk
@call lccmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
@echo "***********************************"
-@pushd ..\parsers\java
+@pushd parsers\java
@call lccmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/compiler
+@echo "Buildung stx/goodies/petitparser/compiler
@echo "***********************************"
-@pushd ..\compiler
+@pushd compiler
@call lccmake %1 %2 || exit /b "%errorlevel%"
@popd
--- a/mingwmake.bat Wed Jun 03 08:48:59 2015 +0100
+++ b/mingwmake.bat Wed Jun 03 09:06:49 2015 +0100
@@ -28,23 +28,23 @@
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
@echo "***********************************"
-@pushd ..\parsers\smalltalk
+@pushd parsers\smalltalk
@call mingwmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
@echo "***********************************"
-@pushd ..\parsers\java
+@pushd parsers\java
@call mingwmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/compiler
+@echo "Buildung stx/goodies/petitparser/compiler
@echo "***********************************"
-@pushd ..\compiler
+@pushd compiler
@call mingwmake %1 %2 || exit /b "%errorlevel%"
@popd
--- a/stx_goodies_petitparser.st Wed Jun 03 08:48:59 2015 +0100
+++ b/stx_goodies_petitparser.st Wed Jun 03 09:06:49 2015 +0100
@@ -117,9 +117,9 @@
^ #(
#'stx:goodies/petitparser/analyzer'
#'stx:goodies/petitparser/tests'
- #'stx:goodies/parsers/smalltalk'
- #'stx:goodies/parsers/java'
- #'stx:goodies/compiler'
+ #'stx:goodies/petitparser/parsers/smalltalk'
+ #'stx:goodies/petitparser/parsers/java'
+ #'stx:goodies/petitparser/compiler'
)
! !
@@ -334,7 +334,7 @@
hgrev := pm revision.
] ifFalse:[
hgrev = pm revision ifFalse:[
- "/ self error: 'Package revisions differ!!'
+ self error: 'Package revisions differ!!'
].
].
].
--- a/vcmake.bat Wed Jun 03 08:48:59 2015 +0100
+++ b/vcmake.bat Wed Jun 03 09:06:49 2015 +0100
@@ -32,23 +32,23 @@
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/smalltalk
+@echo "Buildung stx/goodies/petitparser/parsers/smalltalk
@echo "***********************************"
-@pushd ..\parsers\smalltalk
+@pushd parsers\smalltalk
@call vcmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/parsers/java
+@echo "Buildung stx/goodies/petitparser/parsers/java
@echo "***********************************"
-@pushd ..\parsers\java
+@pushd parsers\java
@call vcmake %1 %2 || exit /b "%errorlevel%"
@popd
@echo "***********************************"
-@echo "Buildung stx/goodies/compiler
+@echo "Buildung stx/goodies/petitparser/compiler
@echo "***********************************"
-@pushd ..\compiler
+@pushd compiler
@call vcmake %1 %2 || exit /b "%errorlevel%"
@popd