Menu
▾
▴
[Aplaws-commit] r198 - in tools/trunk: bundle rpms rpms/httpunit rpms/junit rpms/junitperf rpms/servlet rpms/servlet22 scripts/bin scripts/pkg/dist tools tools/etc
|
From: <ap...@re...> - 2005-02-04 22:36:23
|
Author: apevec
Date: 2005-02-04 23:35:46 +0100 (Fri, 04 Feb 2005)
New Revision: 198
Removed:
tools/trunk/rpms/BUILD/
tools/trunk/rpms/Makefile
tools/trunk/rpms/RPMS/
tools/trunk/rpms/SOURCES/
tools/trunk/rpms/SPECS/
tools/trunk/rpms/SRPMS/
tools/trunk/rpms/download.sh
tools/trunk/rpms/httpunit/BUILD/
tools/trunk/rpms/httpunit/RPMS/
tools/trunk/rpms/httpunit/SRPMS/
tools/trunk/rpms/junit/BUILD/
tools/trunk/rpms/junit/RPMS/
tools/trunk/rpms/junit/SRPMS/
tools/trunk/rpms/junitperf/BUILD/
tools/trunk/rpms/junitperf/RPMS/
tools/trunk/rpms/junitperf/SRPMS/
tools/trunk/rpms/perl/
tools/trunk/rpms/rollingbuild.sh
tools/trunk/rpms/servlet/BUILD/
tools/trunk/rpms/servlet/RPMS/
tools/trunk/rpms/servlet/SRPMS/
tools/trunk/rpms/servlet22/BUILD/
tools/trunk/rpms/servlet22/RPMS/
tools/trunk/rpms/servlet22/SRPMS/
tools/trunk/scripts/bin/.extract-version.pl.test
tools/trunk/scripts/bin/.filter-manifest.pl.test
tools/trunk/scripts/bin/.gen-prototype.pl.test
tools/trunk/scripts/bin/.interpolate.pl.test
tools/trunk/tools/etc/ccm-tools-resin.cmd
tools/trunk/tools/etc/ccm-tools-resin.sh
tools/trunk/tools/etc/ccm-tools-tomcat.cmd
tools/trunk/tools/etc/ccm-tools-tomcat.sh
tools/trunk/tools/etc/ccm-tools.cmd
tools/trunk/tools/etc/ccm-tools.sh
tools/trunk/tools/pm_to_blib
Modified:
tools/trunk/bundle/make-zip.sh
tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in
tools/trunk/tools/README
tools/trunk/tools/make-zip.sh
Log:
cleanup unneeded files
Modified: tools/trunk/bundle/make-zip.sh
===================================================================
--- tools/trunk/bundle/make-zip.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/bundle/make-zip.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -22,7 +22,7 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/commands"
-find bin/ -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
+find bin/ -maxdepth 1 -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
(
cd "$BUILD_HOME";
Deleted: tools/trunk/rpms/Makefile
===================================================================
--- tools/trunk/rpms/Makefile 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/Makefile 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,33 +0,0 @@
-
-SPECS = $(wildcard SPECS/*.spec)
-SOURCES = $(wildcard SOURCES/*.tar.gz)
-
-all: rpms
-
-largefiles: j2sdk
-
-j2sdk:
- ./download.sh j2sdk-1_3_1_06-linux-i586.bin \
- bc20d8ee73e364b9818b371955446991 \
- ftp://wandsworth.london.redhat.com/java \
- SOURCES
- ./download.sh j2sdk-1_4_1_01-linux-i586.bin \
- 107f0a7990d1f12713fe6fe968132989 \
- ftp://wandsworth.london.redhat.com/java \
- SOURCES
-
-rpms:
- mkdir -p BUILD SRPMS RPMS
- mkdir -p RPMS/i386 RPMS/i486 RPMS/i586 RPMS/i686 RPMS/noarch
- set -x; set -e; \
- HERE=`pwd`; \
- if rpm -q openssl | grep 0.9.6; then OPENSSL_VERSION="ok"; fi; \
- for i in $(SPECS) ; do \
- if ( [ $$i != "SPECS/resin.spec" ] && [ $$i != "SPECS/mod_gzip.spec" ] ) || \
- ( [ $$i = "SPECS/resin.spec" ] && [ -n "$$OPENSSL_VERSION" ] ) || \
- ( [ $$i = "SPECS/mod_gzip.spec" ] && rpm -q apache-devel ); then \
- rpmbuild --nodeps --define "_topdir $$HERE" -ba --clean $$i; \
- fi; \
- done
-
-.PHONY: largefiles j2sdk rpms
Deleted: tools/trunk/rpms/download.sh
===================================================================
--- tools/trunk/rpms/download.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/download.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-file=$1
-md5sum=$2
-sourcedir=$3
-destdir=$4
-
-function get
-{
- rm -f $destdir/$file
- wget -O $destdir/$file $sourcedir/$file
-}
-
-# Convoluted logic in the following is required in order to avoid
-# an implementation problem with the shell / '[' command.
-if [ ! -f $destdir/$file ]; then
- get
-elif [ `md5sum $destdir/$file | awk '{print $1}'` != "$md5sum" ]; then
- get
-fi
Deleted: tools/trunk/rpms/rollingbuild.sh
===================================================================
--- tools/trunk/rpms/rollingbuild.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/rpms/rollingbuild.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-FILES=""
-FILES="$FILES Compress-Zlib-1.16"
-FILES="$FILES Archive-Zip-1.05"
-FILES="$FILES Authen-PAM-0.13"
-FILES="$FILES Authen-SASL-2.02"
-FILES="$FILES BSD-Resource-1.15"
-FILES="$FILES Convert-ASN1-0.16"
-FILES="$FILES Net_SSLeay.pm-1.25"
-FILES="$FILES IO-Socket-SSL-0.95"
-FILES="$FILES IO-stringy-2.108"
-FILES="$FILES File-Sync-0.09"
-FILES="$FILES perl-ldap-0.26"
-FILES="$FILES Net-FTPServer-1.111"
-FILES="$FILES Text-Document-0.8.36"
-
-if [ -d build ]; then
- rm -rf build
-fi
-
-mkdir build
-cd build
-
-export AUTO_BUILD_ROOT=/var/builder/build-root
-export PERL5LIB=$AUTO_BUILD_ROOT/usr/lib/perl5/site_perl
-
-for i in $FILES
-do
- tar zxvf ../SOURCES/$i.tar.gz
- (
- cd $i
- perl Makefile.PL
- make
- # No point since building RPMs will run make test later
- #make test
- PERL_VERSION=`perl -e '$version = sprintf "%vd", $^V; $version =~ s/\.[^\.]+$//; print "$version\n"'`
- if [ "$PERL_VERSION" == "5.8" ]; then
- export PERL_INSTALL_ROOT=$AUTO_BUILD_ROOT
- fi
- make install PREFIX=$AUTO_BUILD_ROOT/usr
- )
-done
-
-cd ..
-
-exec make all
Deleted: tools/trunk/scripts/bin/.extract-version.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.filter-manifest.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.gen-prototype.pl.test
===================================================================
Deleted: tools/trunk/scripts/bin/.interpolate.pl.test
===================================================================
Modified: tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in
===================================================================
--- tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.win2k.in 2005-02-04 22:35:46 UTC (rev 198)
@@ -4,10 +4,11 @@
*\\semantic.cache
*\\afiedt.buf
*\\.xvpics\\*
+*\\.svn\\*
*\\build\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\build\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\rollingbuild\\*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\enterprise.init*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\config.vars*
*\\::PACKAGE::-::VERSION::-::RELEASE::\\build.xml
-*\\::PACKAGE::-::VERSION::-::RELEASE::\\MANIFEST.SKIP
\ No newline at end of file
+*\\::PACKAGE::-::VERSION::-::RELEASE::\\MANIFEST.SKIP
Modified: tools/trunk/tools/README
===================================================================
--- tools/trunk/tools/README 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/README 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,7 +1,7 @@
- CCM Devel README
+ CCM Tools README
=================
-This package provides an integrated development environment
-for CCM applications
+This package provides base CCM tools
+to be used in deployment and development environments.
-- End of file
Deleted: tools/trunk/tools/etc/ccm-tools-resin.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools-resin.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-resin.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,12 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_SERVLET_RESIN_START=%prefix%\share\ccm-tools\server\resin\bin\run-resin start
-set CCM_SERVLET_RESIN_STOP=%prefix%\share\ccm-tools\server\resin\bin\run-resin stop
-set CCM_SERVLET_RESIN_CONF=%prefix%\share\ccm-tools\server\resin\bin\resin-conf-gen
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools-resin.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools-resin.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-resin.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,9 +0,0 @@
-prefix=
-
-CCM_SERVLET_RESIN_START="${prefix}/share/ccm-tools/server/resin/bin/run-resin start"
-CCM_SERVLET_RESIN_STOP="${prefix}/share/ccm-tools/server/resin/bin/run-resin stop"
-CCM_SERVLET_RESIN_CONF="${prefix}/share/ccm-tools/server/resin/bin/resin-conf-gen"
-
-export CCM_SERVLET_RESIN_START
-export CCM_SERVLET_RESIN_STOP
-export CCM_SERVLET_RESIN_CONF
Deleted: tools/trunk/tools/etc/ccm-tools-tomcat.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools-tomcat.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-tomcat.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,13 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_SERVLET_TOMCAT_START=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat start
-set CCM_SERVLET_TOMCAT_STOP=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat stop
-set CCM_SERVLET_TOMCAT_CONF=%prefix%\share\ccm-tools\server\tomcat\bin\tomcat-conf-gen
-set CCM_SERVLET_TOMCAT_WINSERVICE=%prefix%\share\ccm-tools\server\tomcat\bin\run-tomcat reinstall
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools-tomcat.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools-tomcat.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools-tomcat.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,9 +0,0 @@
-prefix=
-
-CCM_SERVLET_TOMCAT_START="${prefix}/share/ccm-tools/server/tomcat/bin/run-tomcat start"
-CCM_SERVLET_TOMCAT_STOP="${prefix}/share/ccm-tools/server/tomcat/bin/run-tomcat stop"
-CCM_SERVLET_TOMCAT_CONF="${prefix}/share/ccm-tools/server/tomcat/bin/tomcat-conf-gen"
-
-export CCM_SERVLET_TOMCAT_START
-export CCM_SERVLET_TOMCAT_STOP
-export CCM_SERVLET_TOMCAT_CONF
Deleted: tools/trunk/tools/etc/ccm-tools.cmd
===================================================================
--- tools/trunk/tools/etc/ccm-tools.cmd 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools.cmd 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,12 +0,0 @@
-if "%CCM_ZIP_ROOT%" == "" (
- set CCM_ZIP_ROOT=C:\ccm
-)
-
-set prefix=%CCM_ZIP_ROOT%\usr
-
-set CCM_HOME=%prefix%\share\ccm
-set CCM_TOOLS_HOME=%prefix%\share\ccm-tools
-
-
-set prefix=
-
Deleted: tools/trunk/tools/etc/ccm-tools.sh
===================================================================
--- tools/trunk/tools/etc/ccm-tools.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/etc/ccm-tools.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -1,10 +0,0 @@
-prefix=
-
-CCM_HOME=${prefix}/share/ccm
-CCM_TOOLS_HOME=${prefix}/share/ccm-tools
-
-export CCM_HOME
-export CCM_TOOLS_HOME
-
-
-
Modified: tools/trunk/tools/make-zip.sh
===================================================================
--- tools/trunk/tools/make-zip.sh 2005-02-04 12:07:37 UTC (rev 197)
+++ tools/trunk/tools/make-zip.sh 2005-02-04 22:35:46 UTC (rev 198)
@@ -22,7 +22,7 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/bin"
-find bin/ -type f -name "ccm*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/bin/" \;
+find bin/ -maxdepth 1 -type f -name "ccm*" -not -name "*~" -exec cp {} "$BUILD_DIR/bin/" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/bin"
cp bin/javaconfig "$BUILD_DIR/usr/share/ccm-tools/bin/"
@@ -41,7 +41,7 @@
mkdir -p "$BUILD_DIR/usr/share/ccm/webapps/ROOT/packages/content-section/templates"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/commands"
-find commands/ -type f -not -name "Makefile*" -a -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
+find commands/ -maxdepth 1 -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/commands/" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM"
cp lib/CCM/*.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM"
@@ -80,8 +80,8 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server"
-cp -rp server/resin "$BUILD_DIR/usr/share/ccm-tools/server"
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type f -a \( -name 'Makefile*' -o -name '*~' \) -exec rm -f {} \;
+find server/resin/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
+find server/resin/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
cp lib/CCM/Server/Resin.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
@@ -112,10 +112,8 @@
rm -rf "$BUILD_HOME"
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-cp -rp server/tomcat/bin "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-cp -rp server/tomcat/conf "$BUILD_DIR/usr/share/ccm-tools/server/tomcat"
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type f -a \( -name 'Makefile*' -o -name '*~' \) -exec rm -f {} \;
-find "$BUILD_DIR/usr/share/ccm-tools/server" -type d -a \( -name 'build' \) -exec rm -rf {} \;
+find server/tomcat/bin -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
+find server/tomcat/conf -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -exec cp {} "$BUILD_DIR/usr/share/ccm-tools/{}" \;
mkdir -p "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
cp lib/CCM/Server/Tomcat.pm "$BUILD_DIR/usr/share/ccm-tools/lib/CCM/Server"
Deleted: tools/trunk/tools/pm_to_blib
===================================================================
|
