[Aplaws-commit] r90 - in tools/trunk: devel misc scripts/pkg/dist

[<ssk...@re...>]

Author: sskracic
Date: 2004-11-09 22:13:24 +0100 (Tue, 09 Nov 2004)
New Revision: 90

Modified:
   tools/trunk/devel/ccm-devel.spec.in
   tools/trunk/misc/build-all.sh
   tools/trunk/scripts/pkg/dist/rpm.spec.in
   tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in
Log:
  Hotfixing the build process.  Several extremely tiny fixes
needed to get this process going, and project.xml and
rollingbuild.sh files are still missing from the top-level
application directories.


Modified: tools/trunk/devel/ccm-devel.spec.in
===================================================================
--- tools/trunk/devel/ccm-devel.spec.in	2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/devel/ccm-devel.spec.in	2004-11-09 21:13:24 UTC (rev 90)
@@ -78,6 +78,11 @@
     perl -i -p -e "s,/usr,${USR_DIR}," $ETC_DIR/profile.d/%{name}.sh
 fi
 
+JAVA_DIR=`echo /usr/share/%{name}/lib | sed -e "s,/usr,$USR_DIR,"`
+cd $JAVA_DIR
+ln -sf ant-contrib-0.6.jar ant-contrib.jar
+ln -sf jakarta-oro-2.0.4.jar jakarta-oro.jar
+
 %post cvs 
 ETC_DIR=$RPM_INSTALL_PREFIX0
 VAR_DIR=$RPM_INSTALL_PREFIX2

Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh	2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/misc/build-all.sh	2004-11-09 21:13:24 UTC (rev 90)
@@ -166,6 +166,15 @@
 
   mkdir $VIRTUAL_ROOT
   mkdir $VIRTUAL_ROOT/rpmdb
+
+  # (20041108 Seb)
+  #  This directory must exist because 'rpm -i' of httpunit and friends will fail.
+  #  In a real world, this dir would have been already created by the packages httpunit at ali depend on.
+  mkdir -p $VIRTUAL_ROOT/share/java
+  mkdir -p $VIRTUAL_ROOT/etc/ccm
+  mkdir -p $VIRTUAL_ROOT/etc/profile.d
+  mkdir -p $VIRTUAL_ROOT/share/ccm-tools
+
   $RPM --dbpath $RPM_DB --initdb
 
   cat > fake.spec <<EOF
@@ -194,7 +203,11 @@
 Provides: perl(vars) 
 Provides: perl(Cwd)
 Provides: perl(File::Spec)
+Provides: perl(File::Copy)
+Provides: perl(File::Find)
+Provides: perl(POSIX)
 
+
 %description
 Fake
 
@@ -282,7 +295,7 @@
     echo "BUILDING $i in directory `pwd`"
     rm -rf rollingbuild
     export CCM_APPS=$i
-    ./rollingbuild.sh
+    $BUILD_HOME/rollingbuild.sh
   ) || exit $?
   (
     set -e

Modified: tools/trunk/scripts/pkg/dist/rpm.spec.in
===================================================================
--- tools/trunk/scripts/pkg/dist/rpm.spec.in	2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/scripts/pkg/dist/rpm.spec.in	2004-11-09 21:13:24 UTC (rev 90)
@@ -90,7 +90,7 @@
 fi
 
 if [ -n "$AUTO_BUILD_ROOT" ]; then
-  cp -vr --preserve=all $RPM_BUILD_ROOT/* $AUTO_BUILD_ROOT
+  cp -vr --preserve $RPM_BUILD_ROOT/* $AUTO_BUILD_ROOT
   if [ "%{version}" != "%{appversion}" ] && [ -d $AUTO_BUILD_ROOT/usr/share/java ]; then
     cd $AUTO_BUILD_ROOT/usr/share/java
     for extension in .jar -sql.jar -pdl.jar -system.jar ""; do

Modified: tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in
===================================================================
--- tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in	2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in	2004-11-09 21:13:24 UTC (rev 90)
@@ -104,7 +104,7 @@
 
 if [ -n "$AUTO_BUILD_ROOT" ]; then
   mkdir -p $AUTO_BUILD_ROOT/usr/share/java
-  cp -vrf --preserve=all %{buildroot}/* $AUTO_BUILD_ROOT
+  cp -vrf --preserve %{buildroot}/* $AUTO_BUILD_ROOT
 fi
 
 rm -f "$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"