Changeset 745 for trunk/server/source3/script/build_idl.sh

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/script/build_idl.sh (modified) (3 diffs)

trunk/server/source3/script/build_idl.sh

@@ -1 +1 @@
 #!/bin/sh
 
-ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
+if [ "$1" = "--full" ]; then
+        FULL=1
+        shift 1
+else
+        FULL=0
+fi
+
+ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --client --samba3-ndr-server $PIDL_ARGS --"
 IDL_FILES="$*"
 
@@ -11 +18 @@
 PIDL="$PIDL $ARGS"
 
+if [ $FULL = 1 ]; then
+        echo "Rebuilding all idl files"
+        $PIDL $IDL_FILES || exit 1
+        exit 0
+fi
+
 ##
 ## Find newer files rather than rebuild all of them
@@ -17 +30 @@
 list=""
 for f in ${IDL_FILES}; do
-        basename=`basename $f .idl`
-        ndr="$PIDL_OUTPUTDIR/ndr_$basename.c"
+        b=`basename $f .idl`
+        outfiles="$b.h ndr_$b.h srv_$b.c"
+        outfiles="$outfiles ndr_$b.c srv_$b.h"
 
-        if [ -f $ndr ]; then
-                if [ "x`find $f -newer $ndr -print`" = "x$f" ]; then
-                        list="$list $f"
-                fi
-        else 
+        for o in $outfiles; do
+            [ -f $PIDL_OUTPUTDIR/$o ] || {
                 list="$list $f"
-        fi
+                break
+            }
+            test "`find $f -newer $PIDL_OUTPUTDIR/$o`" != "" && {
+                list="$list $f"
+                break
+            }
+        done
 done