Changeset 9031

Timestamp:

Sep 28, 2006, 1:32:04 PM (20 years ago)

Author:

eugene

Message:

updating psbuild process

Location:

trunk/psconfig

Files:

• psbuild (modified) (8 diffs)
• psconfig.sh (modified) (2 diffs)
• tagsets/ippHead (modified) (2 diffs)

trunk/psconfig/psbuild

@@ -33 +33 @@
 set version = $args[1]
 set group   = $args[2]
-set tagsets = psconfig/tagsets/$group
+set tagsets = tagsets/$group
 
 if (! -e $tagsets) then
@@ -40 +40 @@
 endif
 
-psconfig $version
+source psconfig.sh $version
 
 set psopts = ""
@@ -50 +50 @@
  set tag = $name[2]
 
- cd $dir
+ set cwd = `pwd`
+ cd ../$dir
  
+ echo ""
+ echo "***** building $name ($target) *****"
+ pwd
+
  if ($update) then
   switch ($tag)
@@ -75 +80 @@
  if (-e Build.PL) then
     echo $PERL5LIB
+    alias psperlbuild
     psperlbuild
     # perl Build.PL --install_path script=$bindir --install_path lib=$libdir --install_path bindoc={$PSCONFDIR}/man/man1 --install_path libdoc={$PSCONFDIR}/man/man3
@@ -88 +94 @@
  endif
 
+ if ($rebuild && $clean) then
+   if (-e configure) rm -f Makefile
+   if (-e configure.ac && -e autogen.sh) rm -f configure
+ endif
+
  if (! -e Makefile) set rebuild = 1
 
  if ($rebuild && ! -e configure && -e autogen.sh) then
+    echo psautogen $psopts
     psautogen $psopts
     if ($status) goto failure;
@@ -96 +108 @@
 
  if ($rebuild && -e configure) then
+    echo psconfigure $psopts
     psconfigure $psopts
     if ($status) goto failure;
@@ -103 +116 @@
 
  if ($clean) then 
+    echo make clean
     make clean
     if ($status) goto failure;
@@ -114 +128 @@
 
  success:
- cd ..
+ cd $cwd
 end
 

trunk/psconfig/psconfig.sh

@@ -52 +52 @@
 if ($?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH
 if ($?PKG_CONFIG_PATH == 0) setenv PKG_CONFIG_PATH
-if ($?PERL5LIB == 0) setenv LD_LIBRARY_PATH
+if ($?PERL5LIB == 0) setenv PERL5LIB
 
 # identify system architecture
@@ -215 +215 @@
   alias  psconfigure configure --bindir=$bindir --libdir=$libdir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share --mandir={$PSCONFDIR}/man
   alias  psautogen autogen.sh --bindir=$bindir --libdir=$libdir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share --mandir={$PSCONFDIR}/man
-  alias  psperlbuild perl Build.PL --install_path script=$bindir --install_path lib=$libdir --install_path bindoc={$PSCONFDIR}/man/man1 --install_path libdoc={$PSCONFDIR}/man/man3
-endif
+  alias  psperlbuild perl Build.PL --install_path script=$bindir --install_path arch=$bindir --install_path bin=$bindir --install_path lib=$libdir --install_path bindoc={$PSCONFDIR}/man/man1 --install_path libdoc={$PSCONFDIR}/man/man3
+endif

trunk/psconfig/tagsets/ippHead

@@ -1 @@
-pslib:HEAD
-psmodules:HEAD
+psLib:HEAD
+psModules:HEAD
 
 psphot:HEAD
@@ -17 +17 @@
 glueforge:HEAD
 dbconfig:HEAD
-ippdb:NONE
+ippdb.src:NONE
 ippTools/pXtools:HEAD