From 7a80a7812e068909564e635d0c2f36a87bbeaa39 Mon Sep 17 00:00:00 2001 From: "Cameron (Kamran) Mashayekhi" Date: Mon, 7 Nov 2005 21:02:08 +0000 Subject: [PATCH] nomsg --- shsrc/lshsrc/CASA.spec | 89 +++++++++++-------------------- shsrc/lshsrc/mk-cachetst-dl | 13 +++-- shsrc/lshsrc/mk-cachetst-ol | 12 ++--- shsrc/lshsrc/mk-cai-all | 60 ++++++++++++++++----- shsrc/lshsrc/mk-clientlogin-dl | 3 -- shsrc/lshsrc/mk-clientlogin-ol | 5 +- shsrc/lshsrc/mk-jmicasa-dl | 3 -- shsrc/lshsrc/mk-jmicasa-ol | 5 +- shsrc/lshsrc/mk-loginpam-ol | 3 +- shsrc/lshsrc/mk-micasa-trayapp-dl | 2 - shsrc/lshsrc/mk-micasa-trayapp-ol | 5 +- shsrc/lshsrc/mk-micasa_ad-dl | 4 +- shsrc/lshsrc/mk-micasa_ad-ol | 4 +- shsrc/lshsrc/mk-micasa_gk-dl | 2 - shsrc/lshsrc/mk-micasa_gk-ol | 7 +-- shsrc/lshsrc/mk-micasa_gkwrap-dl | 2 - shsrc/lshsrc/mk-micasa_gkwrap-ol | 2 - shsrc/lshsrc/mk-micasa_kw-dl | 2 - shsrc/lshsrc/mk-micasa_kw-ol | 4 +- shsrc/lshsrc/mk-micasa_kwwrap-dl | 2 - shsrc/lshsrc/mk-micasa_kwwrap-ol | 4 +- shsrc/lshsrc/mk-micasacache-dl | 2 - shsrc/lshsrc/mk-micasacache-ol | 5 +- shsrc/lshsrc/mk-micasaconsole-dl | 2 - shsrc/lshsrc/mk-micasaconsole-ol | 3 +- shsrc/lshsrc/mk-micasad-dl | 2 - shsrc/lshsrc/mk-micasad-ol | 4 +- shsrc/lshsrc/mk-micasadk-dl | 2 - shsrc/lshsrc/mk-micasadk-ol | 4 +- shsrc/lshsrc/mk-micasapol-ol | 3 +- shsrc/lshsrc/mk-micasawrap-dl | 2 +- shsrc/lshsrc/mk-micasawrap-ol | 2 +- shsrc/lshsrc/mk-tstcases-dl | 12 ++--- shsrc/lshsrc/mk-tstcases-ol | 13 +++-- 34 files changed, 117 insertions(+), 172 deletions(-) diff --git a/shsrc/lshsrc/CASA.spec b/shsrc/lshsrc/CASA.spec index 72977f41..d626b2c6 100644 --- a/shsrc/lshsrc/CASA.spec +++ b/shsrc/lshsrc/CASA.spec @@ -17,7 +17,8 @@ URL: http://www.novell.com/products License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Other Autoreqprov: on -Version: 1.5.114 +%define bldno 1.1.1 +Version: 1.5.126 Release: 0 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 @@ -83,10 +84,10 @@ mkdir %{buildroot}%{prefix}/CASA/images mkdir %{buildroot}%{prefix}/CASA/doc mkdir -p %{buildroot}/%{_lib}/security -install -m 755 %{_lib}/lux/ndbg/libmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib} -install -m 755 %{_lib}/lux/ndbg/libad_gk.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib} -install -m 755 %{_lib}/lux/ndbg/libkwallets_rw.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib} -install -m 755 %{_lib}/lux/ndbg/libjmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib} +install -m 755 %{_lib}/lux/ndbg/libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} +install -m 755 %{_lib}/lux/ndbg/libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} +install -m 755 %{_lib}/lux/ndbg/libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} +install -m 755 %{_lib}/lux/ndbg/libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.miCASAWrapper.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.Common.dll %{buildroot}%{prefix}/CASA/%{_lib} install -m 755 %{_lib}/lux/ndbg/Novell.CASA.A-D.dll %{buildroot}%{prefix}/CASA/%{_lib} @@ -138,10 +139,10 @@ ln -s ../CASA/bin/micasad %{buildroot}%{prefix}/bin/micasad ln -s ../CASA/bin/CASAManager.exe %{buildroot}%{prefix}/bin/CASAManager.exe ln -s ../CASA/bin/CASAManager.sh %{buildroot}%{prefix}/bin/CASAManager.sh -ln -s libmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so -ln -s libmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so.1 -ln -s libjmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so -ln -s libjmicasa.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so.1 +ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so +ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so.1 +ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so +ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so.1 #ln -s miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}/jmiCASA.jar ln -s ../CASA/%{_lib}/libmicasa.so %{buildroot}%{prefix}/%{_lib}/libmicasa.so @@ -156,13 +157,13 @@ ln -s ../CASA/%{_lib}/Novell.CASA.A-D.dll %{buildroot}%{prefix}/%{_lib}/Novell.C ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll -ln -s libkwallets_rw.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so -ln -s libkwallets_rw.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1 +ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so +ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1 ln -s ../CASA/%{_lib}/libkwallets_rw.so %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so ln -s ../CASA/%{_lib}/libkwallets_rw.so.1 %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so.1 -ln -s libad_gk.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so -ln -s libad_gk.so.1.5.0 %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so.1 +ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so +ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so.1 ln -s ../CASA/%{_lib}/libad_gk.so %{buildroot}%{prefix}/%{_lib}/libad_gk.so ln -s ../CASA/%{_lib}/libad_gk.so.1 %{buildroot}%{prefix}/%{_lib}/libad_gk.so.1 @@ -175,58 +176,27 @@ ln -s ../CASA/include/micasa_mgmd.h %{buildroot}%{prefix}/include/micasa_mgmd.h #cp %{buildroot}%{prefix}/CASA/bin/novell-ncl-autologin.sh %{buildroot}/etc/profile.d mkdir -p %{buildroot}/etc/init.d +mkdir -p %{buildroot}/etc/ld.so.conf.d cp %{buildroot}%{prefix}/CASA/bin/micasad %{buildroot}/etc/init.d +echo "/opt/novell/CASA/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf %post if [ $1 -eq 1 ] then insserv /etc/init.d/micasad - echo "/opt/novell/CASA/%{_lib}/" >> /etc/ld.so.conf.d/CASA.conf - /sbin/ldconfig - -# for file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm" -# for file in "/etc/security/pam_unix2.conf" -# do -# -# if [ -f $name ] -# then -# awk ' -# /auth/ { authSeen++; } -# /account/ { -# if (!acctSeen && authSeen) -# { -# print "auth\trequired\tpam_micasa.so\n";} -# acctSeen++; -# } -# /session/ { sesSeen++; } -# // {print $0; } -# END { if (sesSeen) -# print "session\trequired\tpam_micasa.so\n"; } -# ' $file > $file.sav -# mv $file.sav $file -# fi -# done - fi +/sbin/ldconfig + %preun -if [ $1 -eq 0 ] -then -# for file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm" -# for file in "/etc/security/pam_unix2.conf" -# do -# if [ -f $name ] -# then -# sed '/pam_micasa/d' $file > $file.sav -# mv $file.sav $file -# fi -# done -# - rm -f /etc/ld.so.conf.d/CASA.conf - /sbin/ldconfig - insserv -r /etc/init.d/micasad -fi + +%stop_on_removal micasad + +%postun +%restart_on_update micasad +%insserv_cleanup +/sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -238,10 +208,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{prefix}/%{_lib} %dir %{prefix}/CASA/%{_lib} %dir %{prefix}/CASA/doc -%dir %{prefix}/CASA/%{_lib}/libmicasa.so.1.5.0 +%dir %{prefix}/CASA/%{_lib}/libmicasa.so.%{bldno} %dir %{prefix}/CASA/%{_lib}/libmicasa.so %dir %{prefix}/CASA/%{_lib}/libmicasa.so.1 -%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.1.5.0 +%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.%{bldno} %dir %{prefix}/CASA/%{_lib}/libjmicasa.so %dir %{prefix}/CASA/%{_lib}/libjmicasa.so.1 %dir %{prefix}/CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll @@ -273,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT /etc/init.d/micasad /%{_lib}/security/pam_micasa.so +/etc/ld.so.conf.d/CASA.conf %files devel %defattr(-,root,root) @@ -296,10 +267,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{prefix}/CASA/%{_lib}/ -%{prefix}/CASA/%{_lib}/libad_gk.so.1.5.0 +%{prefix}/CASA/%{_lib}/libad_gk.so.%{bldno} %{prefix}/CASA/%{_lib}/libad_gk.so %{prefix}/CASA/%{_lib}/libad_gk.so.1 -%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1.5.0 +%{prefix}/CASA/%{_lib}/libkwallets_rw.so.%{bldno} %{prefix}/CASA/%{_lib}/libkwallets_rw.so %{prefix}/CASA/%{_lib}/libkwallets_rw.so.1 %{prefix}/CASA/%{_lib}/Novell.CASA.A-D.dll diff --git a/shsrc/lshsrc/mk-cachetst-dl b/shsrc/lshsrc/mk-cachetst-dl index 3fcec02a..7c4c5414 100644 --- a/shsrc/lshsrc/mk-cachetst-dl +++ b/shsrc/lshsrc/mk-cachetst-dl @@ -4,16 +4,15 @@ mk-dirs cd ../../ PR=`pwd` cd $PR/make -#MAJ_SSS_NO=`cat majver.txt` -#MIN_SSS_NO=`cat minver.txt` -#REV_SSS_NO=`cat revver.txt` -#export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -export BLD_NO=4.0.1 +MAJ_SSS_NO=`cat majver.txt` +MIN_SSS_NO=`cat minver.txt` +REV_SSS_NO=`cat revver.txt` + +export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO cd $PR/c_test/unx_cachetst -#(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -DDEBUG_SSS -g" $2 $3 $4 $5 $6) -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"0\" PROD_NUM=\"4\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -g" $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -DDEBUG_SSS -g" $2 $3 $4 $5 $6) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-cachetst-ol b/shsrc/lshsrc/mk-cachetst-ol index ef0a84f9..81fdae4e 100644 --- a/shsrc/lshsrc/mk-cachetst-ol +++ b/shsrc/lshsrc/mk-cachetst-ol @@ -4,16 +4,14 @@ mk-dirs cd ../../ PR=`pwd` cd $PR/make -#MAJ_SSS_NO=`cat majver.txt` -#MIN_SSS_NO=`cat minver.txt` -#REV_SSS_NO=`cat revver.txt` +MAJ_SSS_NO=`cat majver.txt` +MIN_SSS_NO=`cat minver.txt` +REV_SSS_NO=`cat revver.txt` -#export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -export BLD_NO=4.0.1 +export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO cd $PR/c_test/unx_cachetst -#(make -I $PR/make -f Makefile PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5 $6) -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"0\" PROD_NUM=\"4\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-cai-all b/shsrc/lshsrc/mk-cai-all index a95fa3c9..91e3876e 100644 --- a/shsrc/lshsrc/mk-cai-all +++ b/shsrc/lshsrc/mk-cai-all @@ -5,7 +5,7 @@ rm -rf ../../bin64 ../../bin ../../lib64 ../../lib ../../obj64 ../../obj echo -if (mk-micasacache-ol m clean all) +if (mk-micasacache-ol m clean all ) then echo else @@ -13,7 +13,7 @@ echo '**** BUILDING OPTIMIZED libmicasacache.a FAILED ****' exit 1 fi -if (mk-micasadk-ol m clean all) +if (mk-micasadk-ol m clean all ) then echo else @@ -21,7 +21,7 @@ echo '**** BUILDING OPTIMIZED libmicasa.so FAILED ****' exit 1 fi -if (mk-micasacommon-ol m clean all) +if (mk-micasacommon-ol m clean all ) then echo else @@ -29,7 +29,7 @@ echo '**** BUILDING OPTIMIZED CSharp Common FAILED ****' exit 1 fi -if (mk-micasawrap-ol m clean all) +if (mk-micasawrap-ol m clean all ) then echo else @@ -37,7 +37,7 @@ echo '**** BUILDING CSharp Wrapper FAILED ****' exit 1 fi -if (mk-micasad-ol m clean all) +if (mk-micasad-ol m clean all ) then echo else @@ -45,7 +45,7 @@ echo '**** BUILDING NON-DEBUG miCASA DAEMON FAILED ****' exit 1 fi -if (mk-micasapol-ol m clean all) +if (mk-micasapol-ol m clean all ) then echo else @@ -53,7 +53,7 @@ echo '**** BUILDING NON-DEBUG Policy Lib FAILED ****' exit 1 fi -if (mk-micasa_kw-ol m clean all) +if (mk-micasa_kw-ol m clean all ) then echo else @@ -61,7 +61,7 @@ echo '**** BUILDING NON-DEBUG KWallet Native Lib FAILED ****' exit 1 fi -if (mk-micasa_kwwrap-ol m clean all) +if (mk-micasa_kwwrap-ol m clean all ) then echo else @@ -69,7 +69,7 @@ echo '**** BUILDING NON-DEBUG KWallet Wrapper Dll FAILED ****' exit 1 fi -if (mk-micasa_gk-ol m clean all) +if (mk-micasa_gk-ol m clean all ) then echo else @@ -77,7 +77,7 @@ echo '**** BUILDING NON-DEBUG Gnome Keyring Native Lib FAILED ****' exit 1 fi -if (mk-micasa_gkwrap-ol m clean all) +if (mk-micasa_gkwrap-ol m clean all ) then echo else @@ -85,7 +85,7 @@ echo '**** BUILDING NON-DEBUG Gnome Keyring Wrapper Dll FAILED ****' exit 1 fi -if (mk-micasa_ad-ol m clean all) +if (mk-micasa_ad-ol m clean all ) then echo else @@ -93,7 +93,7 @@ echo '**** BUILDING NON-DEBUG AD Lib FAILED ****' exit 1 fi -if (mk-micasaconsole-ol m clean all) +if (mk-micasaconsole-ol m clean all ) then echo else @@ -101,7 +101,7 @@ echo '**** BUILDING NON-DEBUG CASA Console FAILED ****' exit 1 fi -if (mk-loginpam-ol m clean all) +if (mk-loginpam-ol m clean all ) then echo else @@ -109,7 +109,7 @@ echo '**** BUILDING NON-DEBUG LOGIN PAM FAILED ****' exit 1 fi -if (mk-jmicasa-ol m clean all) +if (mk-jmicasa-ol m clean all ) then echo else @@ -117,4 +117,36 @@ echo '**** BUILDING NON-DEBUG jmicasa FAILED ****' exit 1 fi +#if (mk-casa-tarpkg) +#then +#echo +#else +#echo '**** BUILDING CASA TAR BALL FAILED ****' +#exit 1 +#fi + +#if (mk-casa-rpmpkg) +#then +#echo +#else +#echo '**** BUILDING CASA RPM FAILED ****' +#exit 1 +#fi + + +#if (mk-micasa-rpmpkg) +#then +#echo +#else +#echo '**** BUILDING miCASA RPM FAILED ****' +#exit 1 +#fi + +#if (mk-clientlogin-ol m clean all) +#then +#echo +#else +#echo '**** BUILDING client login FAILED ****' +#exit 1 +#fi diff --git a/shsrc/lshsrc/mk-clientlogin-dl b/shsrc/lshsrc/mk-clientlogin-dl index d51b55b0..ab705dab 100644 --- a/shsrc/lshsrc/mk-clientlogin-dl +++ b/shsrc/lshsrc/mk-clientlogin-dl @@ -8,9 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` - export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-clientlogin-ol b/shsrc/lshsrc/mk-clientlogin-ol index d51b55b0..016ba416 100644 --- a/shsrc/lshsrc/mk-clientlogin-ol +++ b/shsrc/lshsrc/mk-clientlogin-ol @@ -8,9 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` - export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +19,7 @@ ARCH_LIB= fi cd $PR/c_clientlogin -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F" $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall " $2 $3 $5) RCODE=$? cp ./Release/nwautologin ../bin/lux/ndbg/. diff --git a/shsrc/lshsrc/mk-jmicasa-dl b/shsrc/lshsrc/mk-jmicasa-dl index 2daff859..3cc888da 100644 --- a/shsrc/lshsrc/mk-jmicasa-dl +++ b/shsrc/lshsrc/mk-jmicasa-dl @@ -8,10 +8,7 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` -let MAJ_BLD_NO=MAJ_BLD_NO+1 export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO HOST_ARCH=`uname -a | grep -c x86_64` diff --git a/shsrc/lshsrc/mk-jmicasa-ol b/shsrc/lshsrc/mk-jmicasa-ol index 9131dc77..f083b05e 100644 --- a/shsrc/lshsrc/mk-jmicasa-ol +++ b/shsrc/lshsrc/mk-jmicasa-ol @@ -8,10 +8,7 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` -let MAJ_BLD_NO=MAJ_BLD_NO+1 export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO HOST_ARCH=`uname -a | grep -c x86_64` @@ -45,7 +42,7 @@ exit $RCODE fi cd ../jnsscs -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F" $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-loginpam-ol b/shsrc/lshsrc/mk-loginpam-ol index 6ac6eae4..4859e91d 100644 --- a/shsrc/lshsrc/mk-loginpam-ol +++ b/shsrc/lshsrc/mk-loginpam-ol @@ -4,6 +4,7 @@ mk-dirs cd ../../ PR=`pwd` cd $PR/make + MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` @@ -19,7 +20,7 @@ fi cd $PR/login_capture/PAM -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F" $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing " $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasa-trayapp-dl b/shsrc/lshsrc/mk-micasa-trayapp-dl index 5d6a35a1..eec7cc5f 100644 --- a/shsrc/lshsrc/mk-micasa-trayapp-dl +++ b/shsrc/lshsrc/mk-micasa-trayapp-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa-trayapp-ol b/shsrc/lshsrc/mk-micasa-trayapp-ol index b4deec6e..833c7e8b 100644 --- a/shsrc/lshsrc/mk-micasa-trayapp-ol +++ b/shsrc/lshsrc/mk-micasa-trayapp-ol @@ -5,11 +5,10 @@ cd ../../ PR=`pwd` cd $PR/make + MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +21,7 @@ fi cd $PR/c_trayapp -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=trayapp MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=trayapp MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3) RCODE=$? if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasa_ad-dl b/shsrc/lshsrc/mk-micasa_ad-dl index 5b2218ea..032b49d9 100644 --- a/shsrc/lshsrc/mk-micasa_ad-dl +++ b/shsrc/lshsrc/mk-micasa_ad-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +20,7 @@ fi cd $PR/c_adlib -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:LINUX" XTRA=dbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug -d:LINUX" XTRA=dbg $2 $3 $4 $5) RCODE=$? if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasa_ad-ol b/shsrc/lshsrc/mk-micasa_ad-ol index 306cf765..fd3443fe 100644 --- a/shsrc/lshsrc/mk-micasa_ad-ol +++ b/shsrc/lshsrc/mk-micasa_ad-ol @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +20,7 @@ fi cd $PR/c_adlib -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=adlib MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX" XTRA=ndbg $2 $3 $4 $5) RCODE=$? if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasa_gk-dl b/shsrc/lshsrc/mk-micasa_gk-dl index 8cd943cc..acf5356d 100644 --- a/shsrc/lshsrc/mk-micasa_gk-dl +++ b/shsrc/lshsrc/mk-micasa_gk-dl @@ -9,8 +9,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa_gk-ol b/shsrc/lshsrc/mk-micasa_gk-ol index 686b9d20..ca24d31f 100644 --- a/shsrc/lshsrc/mk-micasa_gk-ol +++ b/shsrc/lshsrc/mk-micasa_gk-ol @@ -9,8 +9,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -23,11 +21,8 @@ fi export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig -#cd $PR/c_common -#COMMON_FILES=$(ls) -#(ln -f $COMMON_FILES $PR/c_micasadk) cd $PR/c_adlib/ad_gk/native -(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="`pkg-config --cflags gnome-keyring-1` `pkg-config --libs gnome-keyring-1` `pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0`" $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="`pkg-config --cflags gnome-keyring-1` `pkg-config --libs gnome-keyring-1` `pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasa_gkwrap-dl b/shsrc/lshsrc/mk-micasa_gkwrap-dl index 0ab500b6..769c92be 100644 --- a/shsrc/lshsrc/mk-micasa_gkwrap-dl +++ b/shsrc/lshsrc/mk-micasa_gkwrap-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa_gkwrap-ol b/shsrc/lshsrc/mk-micasa_gkwrap-ol index c985dcc3..52fb985d 100644 --- a/shsrc/lshsrc/mk-micasa_gkwrap-ol +++ b/shsrc/lshsrc/mk-micasa_gkwrap-ol @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa_kw-dl b/shsrc/lshsrc/mk-micasa_kw-dl index ac10f176..985c0083 100644 --- a/shsrc/lshsrc/mk-micasa_kw-dl +++ b/shsrc/lshsrc/mk-micasa_kw-dl @@ -9,8 +9,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa_kw-ol b/shsrc/lshsrc/mk-micasa_kw-ol index 4a65b767..f561c2a4 100644 --- a/shsrc/lshsrc/mk-micasa_kw-ol +++ b/shsrc/lshsrc/mk-micasa_kw-ol @@ -9,8 +9,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -26,7 +24,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/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 -O2 -fmessage-length=0 -Wall -g" $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES rm kwallets_rw.moc diff --git a/shsrc/lshsrc/mk-micasa_kwwrap-dl b/shsrc/lshsrc/mk-micasa_kwwrap-dl index cb6e446f..8f495555 100644 --- a/shsrc/lshsrc/mk-micasa_kwwrap-dl +++ b/shsrc/lshsrc/mk-micasa_kwwrap-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasa_kwwrap-ol b/shsrc/lshsrc/mk-micasa_kwwrap-ol index 5fe93a90..755d3c2a 100644 --- a/shsrc/lshsrc/mk-micasa_kwwrap-ol +++ b/shsrc/lshsrc/mk-micasa_kwwrap-ol @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +20,7 @@ fi cd $PR/c_adlib/ad_kw -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=kwwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=kwwrap MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="" XTRA=ndbg $2 $3 $4 $5) RCODE=$? if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasacache-dl b/shsrc/lshsrc/mk-micasacache-dl index ad1aacb5..d3534b82 100644 --- a/shsrc/lshsrc/mk-micasacache-dl +++ b/shsrc/lshsrc/mk-micasacache-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasacache-ol b/shsrc/lshsrc/mk-micasacache-ol index e20358ee..4d25d447 100644 --- a/shsrc/lshsrc/mk-micasacache-ol +++ b/shsrc/lshsrc/mk-micasacache-ol @@ -8,9 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` - export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -23,7 +20,7 @@ fi cd $PR/c_micasacache -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F" $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasaconsole-dl b/shsrc/lshsrc/mk-micasaconsole-dl index c13874c2..ea587c75 100644 --- a/shsrc/lshsrc/mk-micasaconsole-dl +++ b/shsrc/lshsrc/mk-micasaconsole-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasaconsole-ol b/shsrc/lshsrc/mk-micasaconsole-ol index 178da779..2eb05689 100644 --- a/shsrc/lshsrc/mk-micasaconsole-ol +++ b/shsrc/lshsrc/mk-micasaconsole-ol @@ -5,11 +5,10 @@ cd ../../ PR=`pwd` cd $PR/make + MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasad-dl b/shsrc/lshsrc/mk-micasad-dl index 60f9b962..c39283e9 100644 --- a/shsrc/lshsrc/mk-micasad-dl +++ b/shsrc/lshsrc/mk-micasad-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasad-ol b/shsrc/lshsrc/mk-micasad-ol index 22f07fb8..48fd0ad4 100644 --- a/shsrc/lshsrc/mk-micasad-ol +++ b/shsrc/lshsrc/mk-micasad-ol @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -22,7 +20,7 @@ fi cd $PR/c_micasad -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=csssd MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=bin MODULE=csssd MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-d:LINUX -nowarn:169" XTRA=ndbg $2 $3 $4 $5) RCODE=$? if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasadk-dl b/shsrc/lshsrc/mk-micasadk-dl index 09d88795..81ae77c6 100644 --- a/shsrc/lshsrc/mk-micasadk-dl +++ b/shsrc/lshsrc/mk-micasadk-dl @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO diff --git a/shsrc/lshsrc/mk-micasadk-ol b/shsrc/lshsrc/mk-micasadk-ol index 079f4878..132aa059 100644 --- a/shsrc/lshsrc/mk-micasadk-ol +++ b/shsrc/lshsrc/mk-micasadk-ol @@ -8,8 +8,6 @@ cd $PR/make MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` -INT_BLD_NO=`cat ibuild.txt` -MAJ_BLD_NO=`cat mbuild.txt` export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO @@ -25,7 +23,7 @@ cd $PR/c_common COMMON_FILES=$(ls) (ln -f $COMMON_FILES $PR/c_micasadk) cd $PR/c_micasadk -(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="-DSSCS_LINUX_PLAT_F" $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="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasapol-ol b/shsrc/lshsrc/mk-micasapol-ol index 87ebc263..0f8938b7 100644 --- a/shsrc/lshsrc/mk-micasapol-ol +++ b/shsrc/lshsrc/mk-micasapol-ol @@ -5,6 +5,7 @@ TOP=../../ PR=../ cd $TOP/make + MAJ_SSS_NO=`cat majver.txt` MIN_SSS_NO=`cat minver.txt` REV_SSS_NO=`cat revver.txt` @@ -19,7 +20,7 @@ ARCH_LIB= fi cd $PR/c_policy -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=pollib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux EXT=lib MODULE=pollib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasawrap-dl b/shsrc/lshsrc/mk-micasawrap-dl index cb7024fa..79ae1ce5 100644 --- a/shsrc/lshsrc/mk-micasawrap-dl +++ b/shsrc/lshsrc/mk-micasawrap-dl @@ -19,7 +19,7 @@ ARCH_LIB= fi cd $PR/c_sharp/NSSCSWrapper -(make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5 $6) +(make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-debug" XTRA=dbg $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-micasawrap-ol b/shsrc/lshsrc/mk-micasawrap-ol index 971b619d..8452c06e 100644 --- a/shsrc/lshsrc/mk-micasawrap-ol +++ b/shsrc/lshsrc/mk-micasawrap-ol @@ -20,7 +20,7 @@ fi cd $PR/c_sharp/NSSCSWrapper -(make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg $2 $3 $4 $5 $6) +(make -I $TOP/make -f Makefile ROOT=$TOP PLAT=lux EXT=lib MODULE=cslib BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-tstcases-dl b/shsrc/lshsrc/mk-tstcases-dl index 9f556c2b..1dbd8551 100644 --- a/shsrc/lshsrc/mk-tstcases-dl +++ b/shsrc/lshsrc/mk-tstcases-dl @@ -4,20 +4,18 @@ mk-dirs cd ../../ PR=`pwd` cd $PR/make -#MAJ_SSS_NO=`cat majver.txt` -#MIN_SSS_NO=`cat minver.txt` -#REV_SSS_NO=`cat revver.txt` +MAJ_SSS_NO=`cat majver.txt` +MIN_SSS_NO=`cat minver.txt` +REV_SSS_NO=`cat revver.txt` -#export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -export BLD_NO=4.0.1 +export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO #cd $PR/c_test/unx_cachetst #COMMON_FILES=$(ls *.c) #(ln -f $COMMON_FILES $PR/c_test/unx_testcases) cd $PR/c_test/unx_testcases -#(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -DDEBUG_SSS -g" $2 $3 $4 $5 $6) -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"0\" PROD_NUM=\"4\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -g" $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=dbg XTRA_CFLAGS="-DDEBUG -DDEBUG_SSS -g" $2 $3 $4 $5 $6) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/lshsrc/mk-tstcases-ol b/shsrc/lshsrc/mk-tstcases-ol index 087ac99d..bd5178b3 100644 --- a/shsrc/lshsrc/mk-tstcases-ol +++ b/shsrc/lshsrc/mk-tstcases-ol @@ -4,20 +4,19 @@ mk-dirs cd ../../ PR=`pwd` cd $PR/make -#MAJ_SSS_NO=`cat majver.txt` -#MIN_SSS_NO=`cat minver.txt` -#REV_SSS_NO=`cat revver.txt` -#export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO -export BLD_NO=4.0.1 +MAJ_SSS_NO=`cat majver.txt` +MIN_SSS_NO=`cat minver.txt` +REV_SSS_NO=`cat revver.txt` + +export BLD_NO=$MAJ_SSS_NO.$MIN_SSS_NO.$REV_SSS_NO cd $PR/c_test/unx_cachetst COMMON_FILES=$(ls *.c) (ln -f $COMMON_FILES $PR/c_test/unx_testcases) cd $PR/c_test/unx_testcases -#(make -I $PR/make -f Makefile PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5 $6) -(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"0\" PROD_NUM=\"4\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5) +(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" XTRA=ndbg $2 $3 $4 $5) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0)