Fix scripts for AutoBuild environment

c_adlib/ad_gk/native/link.lux

@@ -1,13 +1,15 @@
-LINK = $(CPP) \
+LINK = $(CPP) \
-	-Wl,-Bsymbolic \
+	-Wl,-Bsymbolic \
-	-shared \
+	-shared \
-	-pthread\
+	-pthread\
-	-O2 -fno-exceptions -fno-check-new\
+	-O2 -fno-exceptions -fno-check-new\
-	-Wl,-rpath -Wl,/usr/lib$(ARCH_LIB) \
+	-Wl,-rpath -Wl,/usr/lib$(ARCH_LIB) \
-	-L/usr/lib$(ARCH_LIB) -lpthread -lc -ldl \
+	-L/usr/lib$(ARCH_LIB) -lpthread -lc -ldl \
-	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
+	-L/opt/gnome/lib -lgnome-keyring -lglib-2.0 \
-	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
+	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
-	-L$(LIBDIR)$(XTRA)  \
+	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
-	$(OBJDIR)*.$(O) `pkg-config --libs gnome-keyring-1` -lgnome-keyring \
+	-L$(LIBDIR)$(XTRA)  \
-	`pkg-config --libs glib-2.0` -lglib-2.0
+	$(OBJDIR)*.$(O)
-
+	 
+
+

c_adlib/ad_kw/native/link.lux

@@ -1,14 +1,14 @@
-LINK = $(CPP) \
+LINK = $(CPP) \
-	-Wl,-Bsymbolic \
+	-Wl,-Bsymbolic \
-	-shared \
+	-shared \
-	-pthread\
+	-pthread\
-	-O2 -fno-exceptions -fno-check-new\
+	-O2 -fno-exceptions -fno-check-new\
-	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
-	-L/usr/lib$(ARC) -lpthread -lc -ldl \
+	-L/usr/lib$(ARC) -lpthread -lc -ldl \
-	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
+	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
-	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
+	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
-	-L$(LIBDIR)$(XTRA)  \
+	-L$(LIBDIR)$(XTRA)  \
-	$(OBJDIR)*.$(O) -L/opt/kde3/lib$(ARC)  \
+	$(OBJDIR)*.$(O) -L/opt/kde3/lib \
-	-L/usr/X11R6/lib$(ARC) -L/usr/lib/qt3/lib$(ARC) \
+	-L/usr/X11R6/lib$(ARC) -L/usr/lib/qt3/lib \
-	-lkwalletclient -lqt-mt	
+	-lkwalletclient -lqt-mt	
-
+

shsrc/lshsrc/mk-ca-all

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 ../wshsrc/mk-ibld-no d
+rm -rf ../../bin64 ../../bin ../../lib64 ../../lib ../../obj64 ../../obj
 
 echo
 
@@ -199,22 +200,6 @@ echo '**** BUILDING NON-DEBUG CASA Console FAILED ****'
 exit 1
 fi
 
-if (mk-micasa-trayapp-dl d clean all)
-then
-echo
-else
-echo '**** BUILDING DEBUG CASATrayApp FAILED ****'
-exit 1
-fi
-
-if (mk-micasa-trayapp-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG CASATrayApp FAILED ****'
-exit 1
-fi
-
 if (mk-loginpam-dl d clean all)
 then
 echo

shsrc/lshsrc/mk-cai-all

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 ../wshsrc/mk-ibld-no m
+rm -rf ../../bin64 ../../bin ../../lib64 ../../lib ../../obj64 ../../obj
 
 echo
 
-if (mk-micasacache-ol d clean all install)
+if (mk-micasacache-ol m clean all install)
 then
 echo
 else
@@ -12,7 +13,7 @@ echo '**** BUILDING OPTIMIZED libmicasacache.a FAILED ****'
 exit 1
 fi
 
-if (mk-micasadk-ol d clean all install)
+if (mk-micasadk-ol m clean all install)
 then
 echo
 else
@@ -20,8 +21,7 @@ echo '**** BUILDING OPTIMIZED libmicasa.so FAILED ****'
 exit 1
 fi
 
-
+if (mk-micasacommon-ol m clean all install)
-if (mk-micasacommon-ol d clean all install)
 then
 echo
 else
@@ -29,8 +29,15 @@ echo '**** BUILDING OPTIMIZED CSharp Common FAILED ****'
 exit 1
 fi
 
+if (mk-micasawrap-ol m clean all)
+then
+echo
+else
+echo '**** BUILDING CSharp Wrapper FAILED ****'
+exit 1
+fi
 
-if (mk-micasad-ol d clean all install)
+if (mk-micasad-ol m clean all install)
 then
 echo
 else
@@ -38,7 +45,7 @@ echo '**** BUILDING NON-DEBUG miCASA DAEMON FAILED ****'
 exit 1
 fi
 
-if (mk-micasapol-ol d clean all install)
+if (mk-micasapol-ol m clean all install)
 then
 echo
 else
@@ -46,7 +53,7 @@ echo '**** BUILDING NON-DEBUG Policy Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_kw-ol clean all install)
+if (mk-micasa_kw-ol m clean all install)
 then
 echo
 else
@@ -54,7 +61,7 @@ echo '**** BUILDING NON-DEBUG KWallet Native Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_kwwrap-ol clean all install)
+if (mk-micasa_kwwrap-ol m clean all install)
 then
 echo
 else
@@ -62,7 +69,7 @@ echo '**** BUILDING NON-DEBUG KWallet Wrapper Dll FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_gk-ol clean all install)
+if (mk-micasa_gk-ol m clean all install)
 then
 echo
 else
@@ -70,7 +77,7 @@ echo '**** BUILDING NON-DEBUG Gnome Keyring Native Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_gkwrap-ol clean all install)
+if (mk-micasa_gkwrap-ol m clean all install)
 then
 echo
 else
@@ -78,7 +85,7 @@ echo '**** BUILDING NON-DEBUG Gnome Keyring Wrapper Dll FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_ad-ol clean all install)
+if (mk-micasa_ad-ol m clean all install)
 then
 echo
 else
@@ -86,7 +93,7 @@ echo '**** BUILDING NON-DEBUG AD Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasaconsole-ol clean all install)
+if (mk-micasaconsole-ol m clean all install)
 then
 echo
 else
@@ -94,15 +101,7 @@ echo '**** BUILDING NON-DEBUG CASA Console FAILED ****'
 exit 1
 fi
 
-if (mk-micasa-trayapp-ol clean all install)
+if (mk-loginpam-ol m clean all install)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG CASATrayApp FAILED ****'
-exit 1
-fi
-
-if (mk-loginpam-ol d clean all install)
 then
 echo
 else
@@ -110,16 +109,7 @@ echo '**** BUILDING NON-DEBUG LOGIN PAM FAILED ****'
 exit 1
 fi
 
-
+if (mk-jmicasa-ol m clean all install)
-if (mk-micasawrap-ol d clean all install)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG Micasa CS Wrapper FAILED ****'
-exit 1
-fi
-
-if (mk-jmicasa-ol d clean all install)
 then
 echo
 else
@@ -127,13 +117,13 @@ echo '**** BUILDING NON-DEBUG jmicasa FAILED ****'
 exit 1
 fi
 
-if (mk-casa-tarpkg)
+#if (mk-casa-tarpkg)
-then
+#then
-echo
+#echo
-else
+#else
-echo '**** BUILDING CASA TAR BALL FAILED ****'
+#echo '**** BUILDING CASA TAR BALL FAILED ****'
-exit 1
+#exit 1
-fi
+#fi
 
 
 #if (mk-casa-rpmpkg)

shsrc/lshsrc/mk-micasa_gk-dl

@@ -13,6 +13,7 @@ INT_BLD_NO=`cat ibuild.txt`
 MAJ_BLD_NO=`cat mbuild.txt`
 
 export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO
+export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/local/lib/pkgconfig
 
 HOST_ARCH=`uname -a | grep -c x86_64`
 if [ $HOST_ARCH -gt 0 ]

shsrc/lshsrc/mk-micasa_gk-ol

@@ -13,6 +13,7 @@ INT_BLD_NO=`cat ibuild.txt`
 MAJ_BLD_NO=`cat mbuild.txt`
 
 export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO
+export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/local/lib/pkgconfig
 
 HOST_ARCH=`uname -a | grep -c x86_64`
 if [ $HOST_ARCH -gt 0 ]

shsrc/lshsrc/mk-micasa_kw-dl

@@ -26,7 +26,7 @@ fi
 #(ln -f $COMMON_FILES $PR/c_micasadk)
 cd $PR/c_adlib/ad_kw/native
 moc kwallets_rw.h -o kwallets_rw.moc
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib\"$ARCH_LIB\"/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
 RCODE=$?
 rm kwallets_rw.moc
 rm -f $COMMON_FILES

shsrc/lshsrc/mk-micasa_kw-ol

@@ -26,7 +26,7 @@ fi
 #(ln -f $COMMON_FILES $PR/c_micasadk)
 cd $PR/c_adlib/ad_kw/native
 moc kwallets_rw.h -o kwallets_rw.moc
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib\"$ARCH_LIB\"/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS  -g" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS  -g" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 rm kwallets_rw.moc