empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r932140 - in /incubator/empire-db/trunk: ./ empire-db-dist/ empire-db-dist/src/ empire-db-dist/src/assemble/
Date Thu, 08 Apr 2010 21:58:14 GMT
Author: francisdb
Date: Thu Apr  8 21:58:13 2010
New Revision: 932140

URL: http://svn.apache.org/viewvc?rev=932140&view=rev
Log:
moving the distribution build to a separate projects

Added:
    incubator/empire-db/trunk/empire-db-dist/
    incubator/empire-db/trunk/empire-db-dist/checksums.sh
      - copied, changed from r931358, incubator/empire-db/trunk/release.sh
    incubator/empire-db/trunk/empire-db-dist/pom.xml
    incubator/empire-db/trunk/empire-db-dist/src/
    incubator/empire-db/trunk/empire-db-dist/src/assemble/
    incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml
      - copied, changed from r926362, incubator/empire-db/trunk/empire-assembly-all.xml
Removed:
    incubator/empire-db/trunk/empire-assembly-all.xml
    incubator/empire-db/trunk/release.sh
Modified:
    incubator/empire-db/trunk/pom.xml

Copied: incubator/empire-db/trunk/empire-db-dist/checksums.sh (from r931358, incubator/empire-db/trunk/release.sh)
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/checksums.sh?p2=incubator/empire-db/trunk/empire-db-dist/checksums.sh&p1=incubator/empire-db/trunk/release.sh&r1=931358&r2=932140&rev=932140&view=diff
==============================================================================
--- incubator/empire-db/trunk/release.sh (original)
+++ incubator/empire-db/trunk/empire-db-dist/checksums.sh Thu Apr  8 21:58:13 2010
@@ -13,73 +13,20 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-echo "Apache Empire-db Release script"
+echo "Apache Empire-db Checksum script"
 echo "----------------------------"
-echo "Building a release for Apache Empire-db. We will need the passphrase for"
-echo "GPG to sign the release."
-echo "This program assumes you use a jdk 1.5 explicitly configured when"
-echo "invoking the 'mvn5' Maven 2 command."
-echo ""
-
-echo "Enter your GPG passphrase (input will be hidden)"
-stty_orig=`stty -g` 
-stty -echo 
-read passphrase
-stty $stty_orig
-
-# Clear the current NOTICE.txt file
-echo "Creating notice file."
-
-NOTICE=NOTICE
-> $NOTICE 
-echo "Apache Empire-db" >> $NOTICE
-echo "Copyright 2008 The Apache Software Foundation" >> $NOTICE
-echo "" >> $NOTICE
-echo "This product includes software developed at" >> $NOTICE
-echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
-echo "" >> $NOTICE
-echo "This is an aggregated NOTICE file for the Apache Empire-db projects included" >>
$NOTICE
-echo "in this distribution." >> $NOTICE
-echo "" >> $NOTICE
-echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE
-echo "    NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >>
$NOTICE
-echo "    AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE
-echo "" >> $NOTICE
-
-# next concatenate all NOTICE files from sub projects to the root file
-for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"`
-do
-	echo "---------------------------------------------------------------------------" >>
$NOTICE
-	echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE
-	echo "---------------------------------------------------------------------------" >>
$NOTICE
-	cat $i >> $NOTICE
-	echo >> $NOTICE
+echo "Generating md5/sha checksum files..."
+for ext in "*.zip" "*.bz2" "*.gz"; do
+  for filename in `find . -type f -name "$ext"`; do
+    md5sum $filename > $filename.md5
+    sha1sum $filename > $filename.sha
+  done
 done
-
-# clean all projects
-echo "Clean all projects"
-mvn5 clean -Pall
-
-# package and assemble the release
-echo "Package and assemble the release"
-# mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:aggregate assembly:attached
$1
-mvn5 -ff -Dgpg.passphrase="$passphrase" clean install javadoc:aggregate assembly:attached
$1
-
-filename=`ls target/dist/apache-empire*gz`
-md5sum $filename > $filename.md5
-sha1sum $filename > $filename.sha
 # gpg --print-md MD5 $filename > $filename.md5
 # gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-
-filename=`ls target/dist/apache-empire*zip`
-md5sum $filename > $filename.md5
-sha1sum $filename > $filename.sha
-# gpg --print-md MD5 $filename > $filename.md5
-# gpg --print-md SHA1 $filename > $filename.sha
-echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
-
-echo "Generating rat report in target/dist"
-mvn5 rat:check -Drat.excludeSubprojects=false -Drat.outputFile=target/dist/rat.txt -N
 
-echo "Distribution build completed in target/dist"
+echo
+echo "Copying rat report..."
+cp ../target/rat.txt ./target
+echo
+echo "All Done. Files available in ./target"

Added: incubator/empire-db/trunk/empire-db-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/pom.xml?rev=932140&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/pom.xml (added)
+++ incubator/empire-db/trunk/empire-db-dist/pom.xml Thu Apr  8 21:58:13 2010
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to You under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>empire-db-parent</artifactId>
+		<groupId>org.apache.empire-db</groupId>
+		<version>2.0.6-incubating-SNAPSHOT</version>
+	</parent>
+	<groupId>org.apache.empire-db</groupId>
+	<artifactId>empire-db-dist</artifactId>
+	<name>Apache Empire-db Distribtion</name>
+	<packaging>pom</packaging>
+
+	<build>	
+		<finalName>apache-empire-db-${project.version}</finalName>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<!-- skip deployment -->
+	               <artifactId>maven-deploy-plugin</artifactId>
+	               <configuration>
+	                 <skip>true</skip>
+	              </configuration>
+	            </plugin>
+            </plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>binary-release-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assemble/empire-assembly-all.xml</descriptor>
+							</descriptors>
+							<tarLongFileFormat>gnu</tarLongFileFormat>
+							<!-- <outputDirectory>${basedir}/target/dist</outputDirectory> -->
+							<!-- <finalName>apache-empire-db-${project.version}</finalName> -->
+							<appendAssemblyId>true</appendAssemblyId>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.empire-db</groupId>
+			<artifactId>empire-db</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.empire-db</groupId>
+			<artifactId>empire-db-struts2</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file

Copied: incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml (from
r926362, incubator/empire-db/trunk/empire-assembly-all.xml)
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml?p2=incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml&p1=incubator/empire-db/trunk/empire-assembly-all.xml&r1=926362&r2=932140&rev=932140&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-assembly-all.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml Thu Apr
 8 21:58:13 2010
@@ -21,17 +21,18 @@
 	<id></id>
 	<formats>
 		<format>tar.gz</format>
+		<format>tar.bz2</format>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<fileSets>
 		<!-- TODO see how to get this working -->
 		<fileSet>
-			<directory>target/site/apidocs</directory>
+			<directory>${basedir}/../target/site/apidocs</directory>
 			<outputDirectory>apidocs</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}</directory>
+			<directory>${basedir}/..</directory>
 			<outputDirectory>src</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
@@ -40,6 +41,8 @@
 				<include>empire-db/**</include>
 				<include>empire-db-struts2/**</include>
 				<include>empire-db-examples/**</include>
+				<include>empire-db-maven-plugin/**</include>
+				<include>empire-db-codegen/**</include>
 			</includes>
 			<excludes>
 				<exclude>**/empire-db/target/**</exclude>
@@ -53,7 +56,7 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}</directory>
+			<directory>${basedir}/..</directory>
 			<outputDirectory/>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
@@ -66,13 +69,13 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>empire-db-examples</directory>
+			<directory>${basedir}/../empire-db-examples</directory>
 			<outputDirectory/>
 			<includes>
 				<include>tutorial.pdf</include>
 			</includes>
 		</fileSet>
-	</fileSets>
+	</fileSets><!--
 	<moduleSets>
 		<moduleSet>
 			<includes>
@@ -86,4 +89,13 @@
 			</binaries>
 		</moduleSet>
 	</moduleSets>
+	--><dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>org.apache.empire-db:empire-db</include>
+                <include>org.apache.empire-db:empire-db-struts2</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
 </assembly>

Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=932140&r1=932139&r2=932140&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Thu Apr  8 21:58:13 2010
@@ -115,6 +115,9 @@
 		<profile>
 			<!-- Part of the release profile, merged with release profile defined in apache parent
pom -->
 			<id>apache-release</id>
+			<modules>
+				<module>empire-db-dist</module>
+			</modules>
 			<build>
 				<plugins>
 					<plugin>
@@ -352,29 +355,6 @@
 			  		</configuration>
 			  	</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>binary-release-assembly</id>
-							<phase>package</phase>
-							<goals>
-								<goal>single</goal>
-							</goals>
-							<configuration>
-								<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-								<descriptors>
-									<descriptor>empire-assembly-all.xml</descriptor>
-								</descriptors>
-								<tarLongFileFormat>gnu</tarLongFileFormat>
-								<outputDirectory>target/dist</outputDirectory>
-								<finalName>apache-empire-db-${project.version}</finalName>
-								<appendAssemblyId>true</appendAssemblyId>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
 					<inherited>true</inherited>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>



Mime
View raw message