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

List:       kde-commits
Subject:    kdenonbeta/ksvg2/bindings
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2005-08-25 9:26:49
Message-ID: 1124962009.877143.7866.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 453121 by wildfox:

Remove some code duplication, add --ontop flag when being in js language mode


 M  +18 -21    kdombinder.sh  


--- trunk/kdenonbeta/ksvg2/bindings/kdombinder.sh #453120:453121
@@ -24,25 +24,17 @@
 	
 if ! test -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUT; then
 	if echo $IDL | grep 'SVGPathSeg'  &>/dev/null; then # Special case for \
                'SVGPathSeg*' files...
-		INPUTABS=`echo $INPUT | sed 's/\.cpp/Abs\.cpp/g'`
-		INPUTREL=`echo $INPUT | sed 's/\.cpp/Rel\.cpp/g'`
+		INPUTABS=""
+		INPUTREL=""
 
-		if [ -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTABS -a \
$BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTABS -nt \
                $SRCDIR/ksvg2/bindings/idl/$MODULE/$IDL ]; then
-			regenerate=false
+		if [ $LANG == "js" ]; then
+			INPUTABS=`echo $INPUT | sed 's/Wrapper\.cpp/AbsWrapper\.cpp/g'`
+			INPUTREL=`echo $INPUT | sed 's/Wrapper\.cpp/RelWrapper\.cpp/g'`
 		else
-			if [ -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTREL -a \
$BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTREL -nt \
                $SRCDIR/ksvg2/bindings/idl/$MODULE/$IDL ]; then
-				regenerate=false
-			fi
+			INPUTABS=`echo $INPUT | sed 's/\.cpp/Abs\.cpp/g'`
+			INPUTREL=`echo $INPUT | sed 's/\.cpp/Rel\.cpp/g'`
 		fi
-	fi
-fi
-
-# Eek code duplication. Leo will take care soon :-)
-if ! test -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUT; then
-	if echo $IDL | grep 'SVGPathSeg'  &>/dev/null; then # Special case for \
                'SVGPathSeg*' files...
-		INPUTABS=`echo $INPUT | sed 's/Wrapper\.cpp/AbsWerapper\.cpp/g'`
-		INPUTREL=`echo $INPUT | sed 's/Wrapper\.cpp/RelWrapper\.cpp/g'`
-
+		
 		if [ -f $BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTABS -a \
$BUILDDIR/ksvg2/bindings/$LANG/$MODULE/$INPUTABS -nt \
$SRCDIR/ksvg2/bindings/idl/$MODULE/$IDL ]; then  regenerate=false
 		else
@@ -54,10 +46,15 @@
 fi
 
 if $regenerate; then
+	ONTOP=""
+	if [ $LANG == "js" ]; then
+		ONTOP="--ontop"
+	fi
+
 	/usr/bin/env perl -I$SRCDIR/kdom/bindings $SRCDIR/kdom/bindings/kdomidl.pl \
-						--generator $LANG --outputdir $BUILDDIR/ksvg2/bindings/$LANG \
-						--input $SRCDIR/ksvg2/bindings/idl/$MODULE/$IDL \
-						--includedir $SRCDIR/kdom/bindings/idl \
-						--includedir $SRCDIR/ksvg2/bindings/idl \
-						--documentation $SRCDIR/ksvg2/bindings/idl/$MODULE/docs-$MODULE.xml >/dev/null
+					  --generator $LANG --outputdir $BUILDDIR/ksvg2/bindings/$LANG \
+					  --input $SRCDIR/ksvg2/bindings/idl/$MODULE/$IDL $ONTOP \
+					  --includedir $SRCDIR/kdom/bindings/idl \
+					  --includedir $SRCDIR/ksvg2/bindings/idl \
+					  --documentation $SRCDIR/ksvg2/bindings/idl/$MODULE/docs-$MODULE.xml \
>/dev/null  fi


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