Now creates src-by-layer entries on the fly, so it doesn't create release zips with no content.
--- a/common/templates/zip.cfg.xml.ftl.template Thu Nov 12 17:46:11 2009 +0000
+++ b/common/templates/zip.cfg.xml.ftl.template Mon Nov 16 16:26:16 2009 +0000
@@ -44,56 +44,7 @@
<set name="archives.dir" value="${build.output.dir}/zips/release" />
<set name="grace.filters" value="src" />
<set name="grace.extract" value="double" />
- <!-- Zips of zips for SFL code -->
- <config name="sfl-adaptation">
- <set name="name" value="src_sfl_adaptation"/>
- <set name="include" value="src_sfl_adaptation_*.zip"/>
- </config>
- <config name="sfl-app">
- <set name="name" value="src_sfl_app"/>
- <set name="include" value="src_sfl_app_*.zip"/>
- </config>
- <config name="sfl-mw">
- <set name="name" value="src_sfl_mw"/>
- <set name="include" value="src_sfl_mw_*.zip"/>
- </config>
- <config name="sfl-os">
- <set name="name" value="src_sfl_os"/>
- <set name="include" value="src_sfl_os_*.zip"/>
- </config>
- <config name="sfl-ostools">
- <set name="name" value="src_sfl_ostools"/>
- <set name="include" value="src_sfl_ostools_*.zip"/>
- </config>
- <config name="sfl-tools">
- <set name="name" value="src_sfl_tools"/>
- <set name="include" value="src_sfl_tools_*.zip"/>
- </config>
- <!-- Zips of zips for OSS code -->
- <config name="oss-adaptation">
- <set name="name" value="src_oss_adaptation"/>
- <set name="include" value="src_oss_adaptation_*.zip"/>
- </config>
- <config name="oss-app">
- <set name="name" value="src_oss_app"/>
- <set name="include" value="src_oss_app_*.zip"/>
- </config>
- <config name="oss-mw">
- <set name="name" value="src_oss_mw"/>
- <set name="include" value="src_oss_mw_*.zip"/>
- </config>
- <config name="oss-os">
- <set name="name" value="src_oss_os"/>
- <set name="include" value="src_oss_os_*.zip"/>
- </config>
- <config name="oss-ostools">
- <set name="name" value="src_oss_ostools"/>
- <set name="include" value="src_oss_ostools_*.zip"/>
- </config>
- <config name="oss-tools">
- <set name="name" value="src_oss_tools"/>
- <set name="include" value="src_oss_tools_*.zip"/>
- </config>
+ <!-- Zips of zips for SFL code and for OSS code will be inserted here -->
</config>
<!-- Specify this config to package all rnd inputs to the build that should be released -->
<config name="rnd" abstract="true">
--- a/common/tools/populateziptemplate.pl Thu Nov 12 17:46:11 2009 +0000
+++ b/common/tools/populateziptemplate.pl Mon Nov 16 16:26:16 2009 +0000
@@ -118,6 +118,20 @@
},
]
};
+ $zipConfig->{config}->{config}->{"src-by-layer"}->{config}->{$license."-$layer"} =
+ {
+ set =>
+ [
+ {
+ name => "name",
+ value => join "_", "src", $license, $layer,
+ },
+ {
+ name => "include",
+ value => join "_", "src", $license, $layer, "*.zip",
+ },
+ ]
+ };
}
elsif ($package->{source} =~ m{/rnd/([^/]+)/([^/]+)})
{