Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r52778:07c7b2f08065
Date: 2012-02-22 11:00 -0800
http://bitbucket.org/pypy/pypy/changeset/07c7b2f08065/
Log: rules for CINT dictionary generation and easier use
diff --git a/pypy/module/cppyy/test/Makefile b/pypy/module/cppyy/test/Makefile
--- a/pypy/module/cppyy/test/Makefile
+++ b/pypy/module/cppyy/test/Makefile
@@ -1,4 +1,5 @@
-dicts = example01Dict.so datatypesDict.so advancedcppDict.so overloadsDict.so
stltypesDict.so operatorsDict.so fragileDict.so std_streamsDict.so
+dicts = example01Dict.so datatypesDict.so advancedcppDict.so overloadsDict.so \
+stltypesDict.so operatorsDict.so fragileDict.so std_streamsDict.so
all : $(dicts)
ROOTSYS := ${ROOTSYS}
@@ -16,38 +17,33 @@
cppflags+=-dynamiclib -single_module -arch x86_64
endif
-ifeq ($(shell $(genreflex) --help | grep -- --with-methptrgetter),)
- genreflexflags=
- cppflags2=-O3 -fPIC
+ifeq ($(CINT),)
+ ifeq ($(shell $(genreflex) --help | grep -- --with-methptrgetter),)
+ genreflexflags=
+ cppflags2=-O3 -fPIC
+ else
+ genreflexflags=--with-methptrgetter
+ cppflags2=-Wno-pmf-conversions -O3 -fPIC
+ endif
else
- genreflexflags=--with-methptrgetter
- cppflags2=-Wno-pmf-conversions -O3 -fPIC
+ cppflags2=-O3 -fPIC -rdynamic
endif
+ifeq ($(CINT),)
%Dict.so: %_rflx.cpp %.cxx
g++ -o $@ $^ -shared -lReflex $(cppflags) $(cppflags2)
%_rflx.cpp: %.h %.xml
$(genreflex) $< $(genreflexflags) --selection=$*.xml
+else
+%Dict.so: %_cint.cxx %.cxx
+ g++ -o $@ $^ -shared $(cppflags) $(cppflags2)
-# rootcint -f example01_cint.cxx -c example01.h example01_LinkDef.h
-# g++ -I$ROOTSYS/include example01_cint.cxx example01.cxx -shared -o
example01Dict.so -rdynamic
-#
-# rootcint -f operators_cint.cxx -c operators.h operators_LinkDef.h
-# g++ -I$ROOTSYS/include operators_cint.cxx operators.cxx -shared -o
operatorsDict.so -rdynamic
-#
-# rootcint -f datatypes_cint.cxx -c datatypes.h datatypes_LinkDef.h
-# g++ -I$ROOTSYS/include datatypes_cint.cxx datatypes.cxx -shared -o
datatypesDict.so -rdynamic
-#
-# rootcint -f advancedcpp_cint.cxx -c advancedcpp.h advancedcpp_LinkDef.h
-# g++ -I$ROOTSYS/include advancedcpp_cint.cxx advancedcpp.cxx -shared -o
advancedcppDict.so -rdynamic
-#
-# rootcint -f fragile_cint.cxx -c fragile.h fragile_LinkDef.h
-# g++ -I$ROOTSYS/include fragile_cint.cxx fragile.cxx -shared -o
fragileDict.so -rdynamic
-#
-# rootcint -f stltypes_cint.cxx -c stltypes.h stltypes_LinkDef.h
-# g++ -I$ROOTSYS/include stltypes_cint.cxx stltypes.cxx -shared -o
stltypesDict.so -rdynamic
+%_cint.cxx: %.h %_LinkDef.h
+ rootcint -f $@ -c $*.h $*_LinkDef.h
+endif
+ifeq ($(CINT),)
# TODO: methptrgetter causes these tests to crash, so don't use it for now
stltypesDict.so: stltypes.cxx stltypes.h stltypes.xml
$(genreflex) stltypes.h --selection=stltypes.xml
@@ -60,6 +56,7 @@
operatorsDict.so: operators.cxx operators.h operators.xml
$(genreflex) operators.h --selection=operators.xml
g++ -o $@ operators_rflx.cpp operators.cxx -shared -lReflex $(cppflags)
$(cppflags2)
+endif
.PHONY: clean
clean:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
