--- a/Make.proto Tue Jan 17 22:28:02 2012 +0100
+++ b/Make.proto Tue Jan 17 22:28:14 2012 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libsvn at 2011-10-01 12:31:29.572.
+# automagically generated from the projectDefinition: stx_libsvn at 2012-01-17 21:27:51.431.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/xml/vw -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libtool2 -I$(INCLUDE_TOP)/stx/libtool
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/xml/vw -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libsvn2 -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libtool2
# if you need any additional defines for embedded C code,
@@ -44,7 +44,7 @@
LOCALDEFINES=
LIBNAME=libstx_libsvn
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
# ********** OPTIONAL: MODIFY the next line ***
@@ -69,9 +69,11 @@
update-svn-revision:
if [ -d .svn ]; then \
- if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
- svnversion -n > .svnversion; \
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+ rev=$(shell svnversion -n); \
+ if [ ! -r .svnversion -o "$$rev" != "$$(cat .svnversion)" ]; then \
+ echo -n $$rev > .svnversion; \
+ rev2=$$(printf "%15s" \'$$rev\'); \
+ sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" \
stx_libsvn.st; \
fi \
fi
@@ -104,8 +106,10 @@
cd ../goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libsvn2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -115,6 +119,7 @@
cleanjunk::
+ -rm -f *.s *.s2
clean::
-rm -f *.o *.H
@@ -148,6 +153,7 @@
$(OUTDIR)SVN__RepositoryConfiguration.$(O) SVN__RepositoryConfiguration.$(H): SVN__RepositoryConfiguration.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__RepositoryManager.$(O) SVN__RepositoryManager.$(H): SVN__RepositoryManager.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__Revision.$(O) SVN__Revision.$(H): SVN__Revision.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SVN__RevisionRange.$(O) SVN__RevisionRange.$(H): SVN__RevisionRange.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__SVNError.$(O) SVN__SVNError.$(H): SVN__SVNError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__Task.$(O) SVN__Task.$(H): SVN__Task.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__WCAction.$(O) SVN__WCAction.$(H): SVN__WCAction.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -156,7 +162,7 @@
$(OUTDIR)SVN__WizardPane.$(O) SVN__WizardPane.$(H): SVN__WizardPane.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__WorkingCopy.$(O) SVN__WorkingCopy.$(H): SVN__WorkingCopy.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__XMLObject.$(O) SVN__XMLObject.$(H): SVN__XMLObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SVNSourceCodeManager.$(O) SVNSourceCodeManager.$(H): SVNSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SVNSourceCodeManager.$(O) SVNSourceCodeManager.$(H): SVNSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(STCHDR)
$(OUTDIR)stx_libsvn.$(O) stx_libsvn.$(H): stx_libsvn.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__AuthorizationError.$(O) SVN__AuthorizationError.$(H): SVN__AuthorizationError.st $(INCLUDE_TOP)/stx/libsvn/SVN__SVNError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__BranchAndRevisionSelectionDialog.$(O) SVN__BranchAndRevisionSelectionDialog.$(H): SVN__BranchAndRevisionSelectionDialog.st $(INCLUDE_TOP)/stx/libsvn/SVN__Dialog.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -200,6 +206,7 @@
$(OUTDIR)SVN__CommitTask.$(O) SVN__CommitTask.$(H): SVN__CommitTask.st $(INCLUDE_TOP)/stx/libsvn/SVN__FileoutLikeTask.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Task.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__CommitWizard.$(O) SVN__CommitWizard.$(H): SVN__CommitWizard.st $(INCLUDE_TOP)/stx/libsvn/SVN__Wizard.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Dialog.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__WizardPane.$(H) $(STCHDR)
$(OUTDIR)SVN__CopyCommand.$(O) SVN__CopyCommand.$(H): SVN__CopyCommand.st $(INCLUDE_TOP)/stx/libsvn/SVN__WCCommand.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Command.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SVN__ExportCommand.$(O) SVN__ExportCommand.$(H): SVN__ExportCommand.st $(INCLUDE_TOP)/stx/libsvn/SVN__BranchCommand.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Command.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__ImportFromCVSTask.$(O) SVN__ImportFromCVSTask.$(H): SVN__ImportFromCVSTask.st $(INCLUDE_TOP)/stx/libsvn/SVN__CVSTask.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Task.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__ListCommand.$(O) SVN__ListCommand.$(H): SVN__ListCommand.st $(INCLUDE_TOP)/stx/libsvn/SVN__BranchCommand.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Command.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SVN__LogCommand.$(O) SVN__LogCommand.$(H): SVN__LogCommand.st $(INCLUDE_TOP)/stx/libsvn/SVN__BranchCommand.$(H) $(INCLUDE_TOP)/stx/libsvn/SVN__Command.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)