From 3b18b2290b5770acc36326f37b4d7637b0308b85 Mon Sep 17 00:00:00 2001 From: cas Date: Mon, 21 Aug 2000 18:15:52 +0000 Subject: [PATCH] No comments --- src/WOKBuilderDef/CMPLRS.edl | 5 +- src/WOKBuilderDef/CSF.edl | 3 ++ src/WOKBuilderDef/LINKSHR.edl | 88 ++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 4 deletions(-) diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl index 852c7a6..ebb2a20 100755 --- a/src/WOKBuilderDef/CMPLRS.edl +++ b/src/WOKBuilderDef/CMPLRS.edl @@ -728,16 +728,15 @@ %CMPLRS_CXX_DBMSOpt, %IncDirectives, %DBDirectives, %Source, %BaseName, %OutputDir, %TmpFile ) is - $cd %OutputDir $%CMPLRS_CXX_Command %CMPLRS_CXX_Options \^ $-I/usr/java_dev2/include \ $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives \^ $-M -c %Source -o %OutputDir/%BaseName.o $set stat = $status $if ( $stat == 0 ) then - $ sed -e 's#%OutputDir/%BaseName.o:##g' %BaseName.u | sort -u > %OutputDir/%BaseName.m + $ sed -e 's#%OutputDir/%BaseName.o:##g' %OutputDir/%BaseName.u | sort -u > %OutputDir/%BaseName.m $endif - $/bin/rm -f %BaseName.u + $#/bin/rm -f %OutputDir/%BaseName.u $set status = $stat @end; diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl index 53830aa..b6e9c30 100755 --- a/src/WOKBuilderDef/CSF.edl +++ b/src/WOKBuilderDef/CSF.edl @@ -169,7 +169,10 @@ @set %CSF_TCL_INCLUDE = "/usr/include "; @set %X11_LIB = "/usr/X11R6/lib"; +--- POP : pour Mesa 3.0 on utilise MesaGL et MesaGLU +--- A partir de Mesa 3.1 on peut utiliser GL et GLU @set %CSF_XwLibs = "-L/usr/X11R6/lib -lX11 -lXext -lXmu -lMesaGL -lMesaGLU -lglut -lXi"; +--- @set %CSF_XwLibs = "-L/usr/X11R6/lib -lX11 -lXext -lXmu -lGL -lGLU -lglut -lXi"; @set %CSF_TclLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltcl8.0"; @set %CSF_TclTkLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltk8.0 -L/usr/X11R6/lib -lX11"; diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl index 5e95a51..394523d 100755 --- a/src/WOKBuilderDef/LINKSHR.edl +++ b/src/WOKBuilderDef/LINKSHR.edl @@ -246,5 +246,91 @@ $ set status=$ld_status @end; @endif; -@endif; + +-- ####### ### # # -- +-- # # # # # -- +-- # # # # # -- +-- ####### # # -- +-- # # # # # -- +-- # # # # # -- +-- # # ### # # -- + + @if ( %Station == "aix" ) then + + @set %LINKSHR_Footer = "LINKSHR_Footer"; + @set %LINKSHR_ArchiveFullPath = "LINKSHR_ArchiveFullPath"; + @set %LINKSHR_ObjectRef = "LINKSHR_ObjectRef"; + @set %LINKSHR_ShortRef = "LINKSHR_ShortRef"; + @set %LINSHR_ShortRef = "LD_ShortRef"; + + @template LINKSHR_ObjectRef ( %ObjectPath ) is + $\^ + @end; + + @template LINKSHR_ArchiveFullPath ( %LibName) is + $ lib%LibName.a \ + $\^ + @end; + + @template LD_ShortRef ( %LibNameUsed ) is + $ -Ilib%LibNameUsed.exp \ + @end; + + @template LINKSHR_Header ( %Target, %LINKSHR_DBMSOpt , %LD_ObjList ) is + $ set allLibPath = `dirname %LD_ObjList`/../../lib/ + $ set localud = `basename %LD_ObjList .ObjList` + $ set locallib = `dirname %LD_ObjList`/../${localud}/lib${localud}.a + $ mv -f $locallib $allLibPath + $ chmod 777 $allLibPath/lib${localud}.a + $/usr/ibmcxx/bin/makeC++SharedLib -o %Target \ + $ -bM:SRE \ + $ -p 0 \ + @end; + + @template LINKSHR_Footer ( %Target, %LibName) is + $ -e$allLibPath/lib%LibName.imp \ + $ -bnoentry ; + $ echo "#\!lib%LibName" > $allLibPath/lib%LibName.exp + $ cat $allLibPath/lib%LibName.imp >> $allLibPath/lib%LibName.exp + $ set ld_status=$status + $ if ( $?LIBPATH ) then + $ set ld_library_path="${LIBPATH}" + $ endif + @end; + + @template LINKSHR_CheckUndefHeader ( + %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH + ) is + $if ( $?LIBPATH ) then + $ setenv LIBPATH %LD_LIBRARY_PATH:${LIBPATH} + $else + $if ( $?LD_LIBRARY_PATH) then + $ setenv LIBPATH %LD_LIBRARY_PATH + $else + $ setenv LIBPATH "" + $endif + $endif + $echo "Check of undefined symbols with LIBPATH : $LIBPATH" \ +--- $/usr/ccs/bin/ld -o /dev/null \ + @end; + + @template LINKSHR_CheckUndefFooter () is + $ ; + $ if ( $status ) then + $ echo "Check failed" + $ else + $ echo "Check successed" + $ endif + $ if ( $?ld_library_path ) then + $ setenv LIBPATH $ld_library_path + $ else + $ unsetenv LIBPATH + $ endif + $ set status=$ld_status + @end; + + + @endif; + + @endif; -- 2.39.5