[Mobies-commit] [commit] r4299 - in UDM/trunk: . lib src/UdmOclPat/GOCL/src
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Sun May 18 23:53:07 CDT 2014
Author: endre
Date: Sun May 18 23:53:07 2014
New Revision: 4299
Log:
MacOSX build : use PCCTS tools antlr, dlg and library from $(PCCTS) env. variable and NOT from UdmOclPat/GOCL/src/ANTLRBase
Modified:
UDM/trunk/MACOS_build.txt
UDM/trunk/Makefile.OSX.incl
UDM/trunk/lib/Makefile.OSX
UDM/trunk/src/UdmOclPat/GOCL/src/Makefile.OSX
Modified: UDM/trunk/MACOS_build.txt
==============================================================================
--- UDM/trunk/MACOS_build.txt Sat May 17 22:43:44 2014 (r4298)
+++ UDM/trunk/MACOS_build.txt Sun May 18 23:53:07 2014 (r4299)
@@ -88,3 +88,39 @@
1. Download Json Spirit from: http://www.codeproject.com/Articles/20027/JSON-Spirit-A-C-JSON-Parser-Generator-Implemented
2. copy the directory json_spirit_v4.06 to a directory where developer tools are (for instance ~/devtools)
3. set/change the value of JSON_SPIRIT to the directory of json_spirit_v4.06/json_spirit in Makefile.OSX.incl located in top directory of UDM (example: ~/devtools/json_spirit_v4.06/json_spirit)
+
+
+MINIZIP
+=======
+
+1. Download Minizip from http://www.winimage.com/zLibDll/unzip101h.zip
+2. Unzip it to a directory where developer tools are (for instance: ~/devtools/minizip)
+3. Replace minizip/Makefile with the following:
+
+-----------8><--------------------------------
+CC=cc
+CFLAGS=$(OPT) -I../.. -Dunix -fPIC -arch i386
+
+.c.o:
+ $(CC) -c $(CFLAGS) $*.c
+
+all: libminizip
+
+libminizip: unzip.o zip.o ioapi.o
+ ar rcs libminizip.a unzip.o zip.o ioapi.o
+
+clean:
+ /bin/rm -f *.o *~ minizip miniunz *.so *.a
+---------8><-----------------------------------
+4. cd minizip; make
+
+PCCTS
+=====
+
+1. Download PCCTS 1.33 MR from http://www.polhode.com/pccts133mr.zip
+2. Unzip it to a directory where developer tools are (like ~/devtools/pccts)
+3. Add -D PCCTS_USE_STDARG to CFLAGS in sorcerer/lib/makefile:
+ CFLAGS=$(COPT) -I../../h -I../h -D PCCTS_USE_STDARG
+4. cd pccts; make
+5. set/change the value of PCCTS to the directory of pccts in Makefile.OSX.incl located in top directory of UDM (example: ~/devtools/pccts)
+
Modified: UDM/trunk/Makefile.OSX.incl
==============================================================================
--- UDM/trunk/Makefile.OSX.incl Sat May 17 22:43:44 2014 (r4298)
+++ UDM/trunk/Makefile.OSX.incl Sun May 18 23:53:07 2014 (r4299)
@@ -38,8 +38,7 @@
JUNITDIR=~/devtools/junit
MINIZIP=~/devtools
BOOST=~/devtools/boost_1_55_0
-ANTLR=~/devtools/pccts/bin/antlr
-DLG=~/devtools/pccts/bin/dlg
+PCCTS=~/devtools/pccts
SWIGDIR=~/devtools/swig-2.0.11
PCRE=~/devtools/pcre-8.33
XERCESCROOT=~/devtools/xerces-c_2_8_0-x86-macosx-gcc_4_0
@@ -64,4 +63,6 @@
DYLDLIBRARYPATH=$(UDMHOME)/lib:$(XERCESCROOT)/lib:$(XALANCROOT)/lib:$(PCRE)/.libs:$(CPPUNITLIBS):$(LIBBOOST_PYTHON_DIR)
SWIGLIB=$(SWIGDIR)/lib
SWIG=$(SWIGDIR)/swig
+ANTLR=$(PCCTS)/bin/antlr
+DLG=$(PCCTS)/bin/dlg
INCLUDE=-I $(UDMHOME)/include -I $(UDMHOME)/src -I $(UDMHOME)/src/UdmOclPat/GOCL/Include/ -I $(MINIZIP) -I $(XERCES)/include -I $(BOOST) -I $(XERCESCROOT)/include -I $(XALANCROOT)/src -I $(XALANCROOT)/nls/include -I $(JSON_SPIRIT)
Modified: UDM/trunk/lib/Makefile.OSX
==============================================================================
--- UDM/trunk/lib/Makefile.OSX Sat May 17 22:43:44 2014 (r4298)
+++ UDM/trunk/lib/Makefile.OSX Sun May 18 23:53:07 2014 (r4299)
@@ -19,7 +19,9 @@
../src/UdmOclPat/GOCL/src/OCLContext.o ../src/UdmOclPat/GOCL/src/OCLFeatureImplementation.o ../src/UdmOclPat/GOCL/src/OCLRefCount.o ../src/UdmOclPat/GOCL/src/OCLTypeExBasic.o \
../src/UdmOclPat/GOCL/src/OCLException.o ../src/UdmOclPat/GOCL/src/OCLObject.o ../src/UdmOclPat/GOCL/src/OCLSignature.o \
../src/UdmOclPat/GOCL/src/generated/OCLLexer.o ../src/UdmOclPat/GOCL/src/generated/OCLParser.o ../src/UdmOclPat/GOCL/src/generated/ocl.o \
- ../src/UdmOclPat/GOCL/src/ANTLRBase/AParser.o ../src/UdmOclPat/GOCL/src/ANTLRBase/ATokenBuffer.o ../src/UdmOclPat/GOCL/src/ANTLRBase/DLexerBase.o \
+ ../src/UdmOclPat/GOCL/src/AParser.o ../src/UdmOclPat/GOCL/src/ASTBase.o ../src/UdmOclPat/GOCL/src/ATokenBuffer.o \
+ ../src/UdmOclPat/GOCL/src/BufFileInput.o ../src/UdmOclPat/GOCL/src/DLexerBase.o ../src/UdmOclPat/GOCL/src/PCCTAST.o ../src/UdmOclPat/GOCL/src/slist.o\
+
$(MINIZIP)/minizip/libminizip.a \
-lz -lxerces-c -lstdc++ -L $(XERCESCROOT)/lib
Modified: UDM/trunk/src/UdmOclPat/GOCL/src/Makefile.OSX
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/Makefile.OSX Sat May 17 22:43:44 2014 (r4298)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/Makefile.OSX Sun May 18 23:53:07 2014 (r4299)
@@ -1,18 +1,23 @@
include ../../../../Makefile.OSX.incl
+
+ANTLR_SOURCES = $(PCCTS)/h/AParser.cpp $(PCCTS)/h/ASTBase.cpp $(PCCTS)/h/ATokenBuffer.cpp \
+ $(PCCTS)/h/BufFileInput.cpp $(PCCTS)/h/DLexerBase.cpp $(PCCTS)/h/PCCTSAST.cpp $(PCCTS)/h/SList.cpp
+
+COPIED_ANTLR_SOURCES = AParser.cpp ASTBase.cpp ATokenBuffer.cpp BufFileInput.cpp DLexerBase.cpp PCCTSAST.cpp SList.cpp
+
SOURCES = OCLCommon.cpp OCLConstraint.cpp OCLContext.cpp \
OCLException.cpp OCLFactory.cpp OCLFeature.cpp \
OCLFeatureImplementation.cpp OCLObject.cpp \
OCLObjectExBasic.cpp OCLParserStatic.cpp \
OCLRefCount.cpp OCLSignature.cpp OCLTree.cpp \
- OCLType.cpp OCLTypeExBasic.cpp generated/OCLLexer.cpp generated/OCLParser.cpp generated/ocl.cpp
+ OCLType.cpp OCLTypeExBasic.cpp generated/OCLLexer.cpp generated/OCLParser.cpp generated/ocl.cpp \
+ $(COPIED_ANTLR_SOURCES)
OBJECTS=$(SOURCES:.cpp=.o)
-all: antlr $(SOURCES) $(OBJECTS)
- echo "\n Invoking make in ANTLRBase ...";
- $(MAKE) -C ANTLRBase/ -f Makefile.OSX;
+all: antlr copy_antlr_base $(SOURCES) $(OBJECTS)
antlr: ocl.g
rm -rf generated
@@ -20,11 +25,14 @@
$(ANTLR) -CC -ft OCLTokens.h -fl OCLParser.dlg -o generated/ ocl.g
$(DLG) -C2 -i -CC -cl OCLLexer generated/OCLParser.dlg -o generated/
+copy_antlr_base: $(ANTLR_SOURCES)
+ cp $(ANTLR_SOURCES) .
+
.cpp.o:
- $(CC) $(CFLAGS) $(INCLUDE) -I generated/ -I ANTLRBase/ $< -o $@
+ $(CC) $(CFLAGS) $(INCLUDE) -I generated/ -I $(PCCTS)/h/ $< -o $@
clean:
rm -f *.o
+ rm -f $(COPIED_ANTLR_SOURCES)
rm -rf generated/
- $(MAKE) clean -C ANTLRBase/ -f Makefile.OSX;
More information about the Mobies-commit
mailing list