diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-13 19:38:15 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-13 19:38:15 +0000 |
commit | bd4fbd7058f1285c24481170d10e34c316cd8e7c (patch) | |
tree | 66bc6ea749e1e1b929f5ea70593242c78908aa83 /java/sca/distribution/features/core/src/main/assembly | |
parent | 9265e51e379f80bd42fd34be90f779545c83a8f0 (diff) |
Simplified the build scripts a bit, added source distro build scripts. Building the core distro now triggers the build of the modules that it includes.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685652 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/features/core/src/main/assembly')
-rw-r--r-- | java/sca/distribution/features/core/src/main/assembly/bin.xml | 18 | ||||
-rw-r--r-- | java/sca/distribution/features/core/src/main/assembly/src.xml | 76 |
2 files changed, 84 insertions, 10 deletions
diff --git a/java/sca/distribution/features/core/src/main/assembly/bin.xml b/java/sca/distribution/features/core/src/main/assembly/bin.xml index cc345b899b..81ae794b5d 100644 --- a/java/sca/distribution/features/core/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/core/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>calculator/**/*</include> <include>binding-echo/**/*</include> @@ -81,6 +81,7 @@ </includes> <excludes> <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> @@ -94,19 +95,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/distribution/features/core/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> |