'kdenonbeta/ksvg2/bindings'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/ksvg2/bindings
From:       Frerich Raabe <raabe () kde ! org>
Date:       2005-09-01 1:12:45
Message-ID: 1125537165.869115.24297.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455626 by raabe:

- Work with unsermake
  This required a little change to the kdombinder.h because of the Abs/Rel
  thing: you can now call kdombinder.sh with 'SVGPathSegArcAbs.cpp' and it'll
  silently strip the 'Abs' so that it finds the correct .idl file.
CCMAIL:buis@kde.org,wildfox@kde.org


 M  +1 -5      cpp/Makefile.am  
 M  +13 -20    cpp/Makefile.bindings  
 M  +1 -1      cpp/svg/Makefile.am  
 M  +1 -5      js/Makefile.am  
 M  +15 -20    js/Makefile.bindings  
 M  +1 -3      js/svg/Makefile.am  
 M  +1 -1      kdombinder.sh  


--- trunk/kdenonbeta/ksvg2/bindings/cpp/Makefile.am #455625:455626
@@ -10,11 +10,7 @@
 libksvg2bindings_cpp_la_LIBADD = \
$(top_builddir)/kdom/bindings/cpp/libkdombindings_cpp.la \  \
svg/libksvg2bindings_cpp_svg.la  
-all: $(SOURCES_SVG)
-	echo;
+all: $(CPP_SOURCES_SVG) $(CPP_HEADERS_SVG)
 
-$(SOURCES_SVG):
-	$(top_srcdir)/ksvg2/bindings/kdombinder.sh "$(top_srcdir)" "cpp" "svg" "$@";
-
 dummy.cpp: $(top_srcdir)/ksvg2/bindings/cpp/Makefile.am
 	echo '' > $@
--- trunk/kdenonbeta/ksvg2/bindings/cpp/Makefile.bindings #455625:455626
@@ -3,22 +3,17 @@
 CLEANFILES = *.cpp *.h
 
 ### Svg Module Source Files
-SOURCES_SVG_PATH_SEG = SVGPathSegArcAbs.cpp SVGPathSegArcRel.cpp \
-					   SVGPathSegCurvetoCubicAbs.cpp SVGPathSegCurvetoCubicRel.cpp \
-					   SVGPathSegCurvetoCubicSmoothAbs.cpp SVGPathSegCurvetoCubicSmoothRel.cpp \
-					   SVGPathSegCurvetoQuadraticAbs.cpp SVGPathSegCurvetoQuadraticRel.cpp \
-					   SVGPathSegCurvetoQuadraticSmoothAbs.cpp \
                SVGPathSegCurvetoQuadraticSmoothRel.cpp \
-					   SVGPathSegLinetoAbs.cpp SVGPathSegLinetoRel.cpp \
-					   SVGPathSegLinetoHorizontalAbs.cpp SVGPathSegLinetoHorizontalRel.cpp \
-					   SVGPathSegLinetoVerticalAbs.cpp SVGPathSegLinetoVerticalRel.cpp \
-					   SVGPathSegMovetoAbs.cpp SVGPathSegMovetoRel.cpp
-
-SOURCES_SVG_PATH_SEG_IDL = SVGPathSegArc.cpp SVGPathSegCurvetoCubic.cpp \
                SVGPathSegCurvetoCubicSmooth.cpp \
-						   SVGPathSegCurvetoQuadratic.cpp SVGPathSegCurvetoQuadraticSmooth.cpp \
-						   SVGPathSegLineto.cpp SVGPathSegLinetoHorizontal.cpp \
-						   SVGPathSegLinetoVertical.cpp SVGPathSegMoveto.cpp
-
-SOURCES_SVG_ALL = SVGStyleElement.cpp SVGScriptElement.cpp SVGCircleElement.cpp \
SVGEllipseElement.cpp \ +# TODO: SVGViewSpec.cpp (no impl class)
+CPP_SOURCES_SVG = SVGPathSegArcAbs.cpp SVGPathSegArcRel.cpp \
+				SVGPathSegCurvetoCubicAbs.cpp SVGPathSegCurvetoCubicRel.cpp \
+				SVGPathSegCurvetoCubicSmoothAbs.cpp SVGPathSegCurvetoCubicSmoothRel.cpp \
+				SVGPathSegCurvetoQuadraticAbs.cpp SVGPathSegCurvetoQuadraticRel.cpp \
+				SVGPathSegCurvetoQuadraticSmoothAbs.cpp SVGPathSegCurvetoQuadraticSmoothRel.cpp \
\ +				SVGPathSegLinetoAbs.cpp SVGPathSegLinetoRel.cpp \
+				SVGPathSegLinetoHorizontalAbs.cpp SVGPathSegLinetoHorizontalRel.cpp \
+				SVGPathSegLinetoVerticalAbs.cpp SVGPathSegLinetoVerticalRel.cpp \
+				SVGPathSegMovetoAbs.cpp SVGPathSegMovetoRel.cpp \
+				SVGStyleElement.cpp SVGScriptElement.cpp SVGCircleElement.cpp \
SVGEllipseElement.cpp \  SVGGElement.cpp SVGException.cpp SVGSVGElement.cpp \
                SVGElement.cpp \
 				SVGRectElement.cpp SVGStylable.cpp SVGLength.cpp SVGAnimatedLength.cpp \
 				SVGAnimatedString.cpp SVGDocument.cpp SVGDOMImplementation.cpp SVGColor.cpp \
@@ -62,8 +57,6 @@
 				SVGTextContentElement.cpp SVGTextPositioningElement.cpp \
 				SVGNumberList.cpp SVGAnimatedNumberList.cpp SVGEvent.cpp
 
-# TODO: SVGViewSpec.cpp (no impl class)
+$(CPP_SOURCES_SVG):
+	$(top_srcdir)/ksvg2/bindings/kdombinder.sh "$(top_srcdir)" "cpp" "svg" "$@";
 
-SOURCES_SVG = $(SOURCES_SVG_ALL) $(SOURCES_SVG_PATH_SEG_IDL)
-SOURCES_SVG_COMPILE = $(SOURCES_SVG_ALL) $(SOURCES_SVG_PATH_SEG)
-
--- trunk/kdenonbeta/ksvg2/bindings/cpp/svg/Makefile.am #455625:455626
@@ -5,4 +5,4 @@
 			  -I$(top_srcdir)/ksvg2/events -I$(top_builddir)/kdom/bindings/cpp \
$(all_includes)  
 noinst_LTLIBRARIES = libksvg2bindings_cpp_svg.la
-libksvg2bindings_cpp_svg_la_SOURCES = $(SOURCES_SVG_COMPILE)
+libksvg2bindings_cpp_svg_la_SOURCES = $(CPP_SOURCES_SVG)
--- trunk/kdenonbeta/ksvg2/bindings/js/Makefile.am #455625:455626
@@ -9,11 +9,7 @@
 libksvg2bindings_js_la_LDFLAGS = $(all_libraries)
 libksvg2bindings_js_la_LIBADD = svg/libksvg2bindings_js_svg.la
 
-all: $(SOURCES_SVG)
-	echo;
+all: $(JS_SOURCES_SVG)
 
-$(SOURCES_SVG):
-	$(top_srcdir)/ksvg2/bindings/kdombinder.sh "$(top_srcdir)" "js" "svg" "$@";
-
 dummy.cpp: $(top_srcdir)/ksvg2/bindings/js/Makefile.am
 	echo '' > $@
--- trunk/kdenonbeta/ksvg2/bindings/js/Makefile.bindings #455625:455626
@@ -1,22 +1,19 @@
 include $(top_srcdir)/ksvg2/Makefile.global
 
-### Svg Module Source Files
-SOURCES_SVG_PATH_SEG = SVGPathSegArcAbsWrapper.cpp SVGPathSegArcRelWrapper.cpp \
-					   SVGPathSegCurvetoCubicAbsWrapper.cpp SVGPathSegCurvetoCubicRelWrapper.cpp \
-					   SVGPathSegCurvetoCubicSmoothAbsWrapper.cpp \
                SVGPathSegCurvetoCubicSmoothRelWrapper.cpp \
-					   SVGPathSegCurvetoQuadraticAbsWrapper.cpp \
                SVGPathSegCurvetoQuadraticRelWrapper.cpp \
-					   SVGPathSegCurvetoQuadraticSmoothAbsWrapper.cpp \
                SVGPathSegCurvetoQuadraticSmoothRelWrapper.cpp \
-					   SVGPathSegLinetoAbsWrapper.cpp SVGPathSegLinetoRelWrapper.cpp \
-					   SVGPathSegLinetoHorizontalAbsWrapper.cpp \
                SVGPathSegLinetoHorizontalRelWrapper.cpp \
-					   SVGPathSegLinetoVerticalAbsWrapper.cpp \
                SVGPathSegLinetoVerticalRelWrapper.cpp \
-					   SVGPathSegMovetoAbsWrapper.cpp SVGPathSegMovetoRelWrapper.cpp
+CLEANFILES = *.cpp *.h
 
-SOURCES_SVG_PATH_SEG_IDL = SVGPathSegArcWrapper.cpp \
                SVGPathSegCurvetoCubicWrapper.cpp \
                SVGPathSegCurvetoCubicSmoothWrapper.cpp \
-						   SVGPathSegCurvetoQuadraticWrapper.cpp \
                SVGPathSegCurvetoQuadraticSmoothWrapper.cpp \
-						   SVGPathSegLinetoWrapper.cpp SVGPathSegLinetoHorizontalWrapper.cpp \
-						   SVGPathSegLinetoVerticalWrapper.cpp SVGPathSegMovetoWrapper.cpp
-
-SOURCES_SVG_ALL = SVGStyleElementWrapper.cpp SVGScriptElementWrapper.cpp \
SVGCircleElementWrapper.cpp SVGEllipseElementWrapper.cpp \ +### Svg Module Source \
Files +# TODO: SVGViewSpecWrapper.cpp (no impl class)
+JS_SOURCES_SVG = SVGPathSegArcAbsWrapper.cpp SVGPathSegArcRelWrapper.cpp \
+				SVGPathSegCurvetoCubicAbsWrapper.cpp SVGPathSegCurvetoCubicRelWrapper.cpp \
+				SVGPathSegCurvetoCubicSmoothAbsWrapper.cpp \
SVGPathSegCurvetoCubicSmoothRelWrapper.cpp \ \
+				SVGPathSegCurvetoQuadraticAbsWrapper.cpp \
SVGPathSegCurvetoQuadraticRelWrapper.cpp \ \
+				SVGPathSegCurvetoQuadraticSmoothAbsWrapper.cpp \
SVGPathSegCurvetoQuadraticSmoothRelWrapper.cpp \ +				SVGPathSegLinetoAbsWrapper.cpp \
SVGPathSegLinetoRelWrapper.cpp \ +				SVGPathSegLinetoHorizontalAbsWrapper.cpp \
SVGPathSegLinetoHorizontalRelWrapper.cpp \ \
+				SVGPathSegLinetoVerticalAbsWrapper.cpp SVGPathSegLinetoVerticalRelWrapper.cpp \ \
+				SVGPathSegMovetoAbsWrapper.cpp SVGPathSegMovetoRelWrapper.cpp \ \
+				SVGStyleElementWrapper.cpp SVGScriptElementWrapper.cpp \
                SVGCircleElementWrapper.cpp SVGEllipseElementWrapper.cpp \
 				SVGGElementWrapper.cpp SVGExceptionWrapper.cpp SVGSVGElementWrapper.cpp \
                SVGElementWrapper.cpp \
 				SVGRectElementWrapper.cpp SVGStylableWrapper.cpp SVGLengthWrapper.cpp \
                SVGAnimatedLengthWrapper.cpp \
 				SVGAnimatedStringWrapper.cpp SVGDocumentWrapper.cpp \
SVGDOMImplementationWrapper.cpp SVGColorWrapper.cpp \ @@ -60,8 +57,6 @@
 				SVGTextContentElementWrapper.cpp SVGTextPositioningElementWrapper.cpp \
 				SVGNumberListWrapper.cpp SVGAnimatedNumberListWrapper.cpp SVGEventWrapper.cpp
 
-# TODO: SVGViewSpecWrapper.cpp (no impl class)
+$(JS_SOURCES_SVG):
+	$(top_srcdir)/ksvg2/bindings/kdombinder.sh "$(top_srcdir)" "js" "svg" "$@";
 
-SOURCES_SVG = $(SOURCES_SVG_ALL) $(SOURCES_SVG_PATH_SEG_IDL)
-SOURCES_SVG_COMPILE = $(SOURCES_SVG_ALL) $(SOURCES_SVG_PATH_SEG)
-
--- trunk/kdenonbeta/ksvg2/bindings/js/svg/Makefile.am #455625:455626
@@ -4,7 +4,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/ksvg2 -I$(top_srcdir)/kdom/core \
                -I$(top_srcdir)/ksvg2/svg \
 			  -I$(top_srcdir)/ksvg2/events -I$(top_builddir)/kdom/bindings/js $(all_includes)
 
-CLEANFILES = *.cpp *.h
-
 noinst_LTLIBRARIES = libksvg2bindings_js_svg.la
-libksvg2bindings_js_svg_la_SOURCES = $(SOURCES_SVG_COMPILE)
+libksvg2bindings_js_svg_la_SOURCES = $(JS_SOURCES_SVG)
--- trunk/kdenonbeta/ksvg2/bindings/kdombinder.sh #455625:455626
@@ -13,7 +13,7 @@
 
 BUILDDIR=`awk '/^top_builddir =/{print $3}' Makefile`
 
-IDL=`basename $INPUT | sed 's/\.cpp/\.idl/g' | sed 's/Wrapper//'`
+IDL=`basename $INPUT | sed 's/\.cpp/\.idl/g' | sed 's/Wrapper//' | sed -e \
's,Abs\.idl,.idl,;s,Rel\.idl,.idl,'`  
 regenerate=true
 test -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUT \


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic