CVS: crater/x11-apps/openoffice-src scale-icons, NONE, 1.1 BUILD, 1.6, 1.7 DETAILS, 1.7, 1.8 PRE_BUILD, 1.2, 1.3 build-ooo, 1.2, 1.3

nhudson at lunar-linux.org nhudson at lunar-linux.org
Sun Aug 10 15:35:28 GMT 2003


Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv30084

Modified Files:
	BUILD DETAILS PRE_BUILD build-ooo 
Added Files:
	scale-icons 
Log Message:

Ok I am getting rid of the compile of binutils and using the system install of
binutils instead.  I am working on getting rid of gcc also but it looks like it
will only build with gcc 3.2.2 which comes with the module


--- NEW FILE: scale-icons ---
#!/usr/bin/perl -w

# Newer ImageMagick's don't like some of the
# broken icons OO.o contains.
$lc_good = 'res/lc00000.bmp';
$sc_good = 'res/sc00000.bmp';

# beautiful hard-coding action.
@scale_dirs = (
	'res',
	'sc/res/imglst/apptbx',
	'sc/res/imglst/navipi',
	'sd/res/imagelst',
	'sd/res/imagelst/korean',
	'sw/win/imglst', 
	'sw/win/imglst/korean',
	'sch/res',
	'offmgr/res',
	'res/enus',
	'dbaccess/res',
	'sc/res',
	'sd/res',
	'sw/win/res',
	'starmath/res',
	'res/arab',
	'res/chinsim',
	'res/chintrad',
	'res/czech',
	'res/dtch',
	'res/fren',
	'res/ital',
	'res/japn',
	'res/korean',
	'res/pol',
	'res/poln',
	'res/port',
	'res/portbr',
	'res/russ',
	'res/slovak',
	'res/span',
	'res/turk'
	       );

%scale_exceptions = (
	'sw/win/imglst' => '[sn][cr][0-9]*\.bmp',
	'sc/res/imglst/navipi' => 'na0.*\.bmp',
	'res' => '[si][cm][0-9]*\.bmp'
);

if (@ARGV < 1) {
    printf "Usage: scale-icons </path/to/ooo_checkout>\n";
    exit (1);
}

$OOO_PATH = shift (@ARGV);

$lc_good = "$OOO_PATH/$lc_good";
$sc_good = "$OOO_PATH/$sc_good";

$quiet = 0;
$remove = 0;
foreach $a (@ARGV) {
    if ($a eq '--quiet') {
	$quiet = 1;
    } elsif ($a eq '--remove') {
	$remove = 1;
    }
}

sub handle_scaled {
    my $instdir = shift;
    my $small_regex = shift;
    my $large_regex = shift;
    my ($dirhandle, $file);
    my $STAMPNAME = "$instdir/ooo-convert-stamp";

    if (! -d $instdir) {
	print "skipping $instdir\n";
	next;
    }

    if ($remove) {
	-f $STAMPNAME || return;
    } else {
	-f $STAMPNAME && return;
    }

    print "Scaling: '$instdir'\n";
    
    opendir ($dirhandle, $instdir) || die "can't opendir $instdir: $!";
    
    while ($file = readdir ($dirhandle)) {
	if ($file =~ m/^$small_regex$|^$large_regex$/) {
	    my $src = "$instdir/$file";
	    my $dest = "$src.cnvt";

	    if ($remove) {
		$quiet || print "Remove '$src'\n";
		unlink ($src);
		next;
	    }
	    $quiet || print "Convert '$src'\n";

	    -f $src || die "Internal error";

	    if ($src =~ /$small_regex/) {
		if (system ("convert -mattecolor '#c0c0c0' -frame 2x2 -crop 16x16+2+2 $src $dest") != 0) {
		    print "*** Warning: convert failed; trying copy\n";
		    system ("cp -f $sc_good $dest");
		}
	    } elsif ($src =~ /$large_regex/) {
		if (system ("convert -mattecolor '#c0c0c0' -frame 2x2 -crop 24x24+3+2 $src $dest") != 0) {
		    print "*** Warning: convert failed; trying copy\n";
		    system ("cp -f $lc_good $dest");
		}
	    }
	    if (-f $dest) {
		rename ($src, "$src.orig");
		rename ($dest, $src);
	    }
	}
    }
   
    closedir ($dirhandle);

    if ($remove) {
	unlink ("$STAMPNAME");
    } else {
	my $stamphandle;
	open ($stamphandle, ">$STAMPNAME") || die "Error stamping $STAMPNAME $!";
	print $stamphandle "Stamp\n";
	close ($stamphandle);
    }
}

for $a (@scale_dirs) {
    my $small_regex;
    if (defined ($scale_exceptions{$a})) {
	$small_regex = $scale_exceptions{$a};
	print "Exception on '$a' => '$small_regex'\n";
    } else {
	$small_regex = 'sc[0-9]*\.bmp';
    }
    handle_scaled ("$OOO_PATH/$a", $small_regex, 'lc[0-9]*\.bmp');
}

print "Completed cleanly.\n";
exit (0);

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	10 Aug 2003 04:57:05 -0000	1.6
+++ BUILD	10 Aug 2003 15:35:26 -0000	1.7
@@ -6,7 +6,11 @@
                 --enable-devel    \
 		$OPTS &&
 
-  cd build/RC3_030729/solenv/inc    &&
+  echo "applying patches"         &&
+  cd src/RC3_030729               &&
+  ../../patches/apply.pl ../../patches/RC3_030729/ . &&
+
+  cd solenv/inc    &&
   cp unxlngi3.mk unxlngi3.mk.orig &&
   sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" \
   unxlngi3.mk.orig > unxlngi3.mk &&
@@ -15,8 +19,12 @@
   sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" \
   unxlngi4.mk.orig > unxlngi4.mk
 
+  cd $SOURCE_DIRECTORY/src/RC030729/extras/source/symbols &&
+  rm -fr *bmp
+
   cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&
   cp $SCRIPT_DIRECTORY/package-ooo $SOURCE_DIRECTORY/bin &&
+  cp $SCRIPT_DIRECTORY/scale-icons $SOURCE_DIRECTORY/bin &&
   cd $SOURCE_DIRECTORY &&
 
   default_make  

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DETAILS	9 Aug 2003 23:20:14 -0000	1.7
+++ DETAILS	10 Aug 2003 15:35:26 -0000	1.8
@@ -2,21 +2,19 @@
          VERSION=1.1rc3
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=RC3_030729.tar.bz2
-         SOURCE3=gcc-3.2.2.tar.bz2 
-         SOURCE4=binutils-2.13.2.1.tar.bz2 
-         SOURCE5=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
-         SOURCE6=ooo-icons-RC3-2.tar.gz
+         SOURCE3=gcc-3.2.2.tar.bz2
+         SOURCE4=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
+         SOURCE5=ooo-icons-RC3-2.tar.gz
       SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
      SOURCE2_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE2
      SOURCE3_URL=http://ooo.ximian.com/packages/support/$SOURCE3
      SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
-     SOURCE5_URL=http://ooo.ximian.com/packages/support/$SOURCE5
-     SOURCE6_URL=http://ooo.ximian.com/packages/$SOURCE6
+     SOURCE5_URL=http://ooo.ximian.com/packages/$SOURCE6
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com
          ENTERED=20030805
-         UPDATED=20030805
+         UPDATED=20030810
            SHORT="OO.o Office Suite with Ximian Patches"
 cat << EOF
 OO.o Office Suite with Ximian Patches

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_BUILD	10 Aug 2003 04:45:06 -0000	1.2
+++ PRE_BUILD	10 Aug 2003 15:35:26 -0000	1.3
@@ -7,7 +7,6 @@
   cp $SOURCE_CACHE/$SOURCE3 src/ &&
   cp $SOURCE_CACHE/$SOURCE4 src/ &&
   cp $SOURCE_CACHE/$SOURCE5 src/ &&
-  cp $SOURCE_CACHE/$SOURCE6 src/ &&
   cd src/                        &&
   unpack $SOURCE2               
 )

Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build-ooo	10 Aug 2003 04:45:06 -0000	1.2
+++ build-ooo	10 Aug 2003 15:35:26 -0000	1.3
@@ -32,10 +32,7 @@
 GCC_TARBALL=gcc-3.2.2.tar.bz2
 GCC_UNTAR_OPTIONS=jxf
 
-BINUTILS_VER=binutils-2.13.2.1
-BINUTILS_TARBALL=binutils-2.13.2.1.tar.bz2
-BINUTILS_UNTAR_OPTIONS=jxf
-
+# Versions
 if test ${CVSTAG:0:3} == 'OOO'; then
     JDK_VER=j2sdk1.3.1
     JDK_TARBALL=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
@@ -67,30 +64,21 @@
     fi
 }
 
-if test "z$WITH_SRC" = "z"; then
-    mkdir -p $SRCDIR
-    cd $SRCDIR
-
-    echo "Checking for source packages in $SRCDIR";
-    check-tarball $GCC_TARBALL
-    check-tarball $BINUTILS_TARBALL
-    check-tarball $JDK_TARBALL
-    check-tarball $OOO_TARBALL
-    check-tarball $OOO_ICONS_TARBALL
-
-    if test ! -f $GCC_TARBALL; then
-	echo "You need to put the relevant source packages into $SRCDIR before commencing the build";
-	exit 1
-    fi
-else
-    if test ! -d "$BUILDDIR/$JDK_VER" ||
-       test ! -d "$BUILDDIR/$GCC_VER" ||
-       test ! -d "$BUILDDIR/$OOO_ICONS_VER" ||
-       test ! -d "$BUILDDIR/$BINUTILS_VER"; then
-       echo "Missing some of the helper source";
-       exit 1;
-    fi
-fi
+#if test "z$WITH_SRC" = "z"; then
+#    mkdir -p $SRCDIR
+#    cd $SRCDIR
+#
+#    echo "Checking for source packages in $SRCDIR";
+#    check-tarball $JDK_TARBALL
+#    check-tarball $OOO_ICONS_TARBALL
+#
+#else
+#    if test ! -d "$BUILDDIR/$JDK_VER" ||
+#       test ! -d "$BUILDDIR/$OOO_ICONS_VER" ||
+#       echo "Missing some of the helper source";
+#       exit 1;
+#    fi
+#fi
 
 cd $BUILDDIR
 
@@ -111,24 +99,7 @@
 	touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
 fi
 
-# build binutils
-PKG_VER=$BINUTILS_VER
 
-# -- evil cut --
-if test -f $BUILDDIR/$PKG_VER/$STAMP; then
-	echo "Skipping $PKG_VER";
-else
-	echo "Building $PKG_VER";
-	cd $BUILDDIR
-	if test "z$WITH_SRC" = "z"; then
-	    tar $BINUTILS_UNTAR_OPTIONS $SRCDIR/$BINUTILS_TARBALL || exit 1;
-	fi
-	cd $PKG_VER
-	./configure --prefix=$BUILDDIR || exit 1;
-	make && make install || exit 1;
-	touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
-fi
-# -- cut --
 
 PKG_VER=$OOO_ICONS_VER
 
@@ -143,68 +114,36 @@
 	fi
 	touch $BUILDDIR/$PKG_VER/$STAMP || exit 1;
 fi
-# -- cut --
 
 # build gcc
 PKG_VER=$GCC_VER
-
+                                                                                
 # -- evil cut --
 if test -f $BUILDDIR/$PKG_VER/$STAMP; then
-	echo "Skipping $PKG_VER";
+        echo "Skipping $PKG_VER";
 else
-	echo "Building $PKG_VER";
-	cd $BUILDDIR
-	if test "z$WITH_SRC" = "z"; then
-	    tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
-	fi
-	cd $PKG_VER
-	./configure --prefix=$BUILDDIR || exit 1;
-	make && make install || exit 1;
-	touch $BUILDDIR/$PKG_VER/$STAMP
+        echo "Building $PKG_VER";
+        cd $BUILDDIR
+        if test "z$WITH_SRC" = "z"; then
+            tar $GCC_UNTAR_OPTIONS $SRCDIR/$GCC_TARBALL || exit 1;
+        fi
+        cd $PKG_VER
+        ./configure --prefix=$BUILDDIR || exit 1;
+        make && make install || exit 1;
+        touch $BUILDDIR/$PKG_VER/$STAMP
 fi
 # -- cut --
 
-# Checkout / Update source:
-if (test "z$2" = "z--checkout") || !(test -f $OOBUILDDIR/$STAMP); then
-	if test "z$WITH_SRC" = "z"; then
-		if test ! -d $OOBUILDDIR/solenv; then
-			echo "OOo build tree not found; unpacking it... [go make some tea]"
-			cd $OOBUILDDIR
-			cd ..
-			tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1
-		else
-			echo "Reverting patches ..."
-			$TOOLSDIR/patches/apply.pl $TOOLSDIR/patches/$CVSTAG $OOBUILDDIR --distro=$DISTRO -R
-		fi
-
-		echo "Removing custom icons";
-		$TOOLSDIR/bin/scale-icons $OOBUILDDIR --remove || exit 1;
-
-		echo "Poking resource builds";
-		find $OOBUILDDIR -name '*.dpr' -exec rm {} \;
-		find $OOBUILDDIR -name '*.don' -exec rm {} \;
-		find $OOBUILDDIR -name '*.srs' -exec rm {} \;
-
-		echo "Updating source ..."
-		cd $OOBUILDDIR
+        echo "Removing custom icons";
+        $TOOLSDIR/bin/scale-icons $OOBUILDDIR --remove || exit 1;
 
-	else
-		# We expect a pristine copy to be there already ...
+        echo "Poking resource builds";
+	find $OOBUILDDIR -name '*.dpr' -exec rm {} \;
+	find $OOBUILDDIR -name '*.don' -exec rm {} \;
+	find $OOBUILDDIR -name '*.srs' -exec rm {} \;
 
-		if test ! -d "$BUILDDIR/$CVSTAG"; then
-			echo "Missing the main OO.o source tree";
-		fi
-	fi
 
 	cd $OOBUILDDIR
-
-	# (re)apply patches
-	if test "z$2" = "z--nopatch"; then
-		echo "Skipping patching";
-	else
-		echo "Re-applying patches"
-		$TOOLSDIR/patches/apply.pl $TOOLSDIR/patches/$CVSTAG $OOBUILDDIR --distro=$DISTRO -f || exit 1;
-	fi
 
 	echo "Installing / scaling icons";
 	$TOOLSDIR/bin/scale-icons $OOBUILDDIR || echo "Error: scaling failed";




More information about the Lunar-commits mailing list