summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 18:37:33 +0000
committertschoening <tschoening@13f79535-47bb-0310-9956-ffa450edef68>2016-03-25 18:37:33 +0000
commit675b171bf8acc54b8cfdc7b6c1774728dccff542 (patch)
treeea03ea17ffe8c5460e96bca1dee5ba87f21b272b
parent340974fee73f8cae095b2d5d64357828dc9a80af (diff)
downloadlog4cxx-675b171bf8acc54b8cfdc7b6c1774728dccff542.tar.gz
Project files use relative paths and those are only valid if one additional level is used in the release archive. But that should make the dir more easier to read anyways.
git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1736640 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/assembly/source.xml28
1 files changed, 25 insertions, 3 deletions
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index 7cf7bc5..99fbc8a 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -106,15 +106,25 @@
<directoryMode>0755</directoryMode>
</fileSet>
+ <!--
+ Special handling for project files
+
+ Project files are generated in the target directory and contain relative paths out of that dir
+ into the project's src dir and that of apr. Those relative paths stay valid only if those files
+ are placed in the same hierarchy level in the release archive. If the files are generated in a
+ different level, the placement in the release archive needs to be adopted and vice versa. That's
+ why the release archive structure is not replicated in the target directory, we need to stay
+ with two levels, but that allows us to keep the target dir somewhat clean and provide a logical
+ structure in the release archive.
+ -->
<fileSet>
<directory>target/projects</directory>
<lineEnding>keep</lineEnding>
- <outputDirectory>projects</outputDirectory>
+ <outputDirectory>projects/vc6</outputDirectory>
<includes>
<include>*.dsw</include>
<include>*.dsp</include>
- <include>*.xcodeproj/project.pbxproj</include>
</includes>
<excludes>
@@ -123,8 +133,20 @@
</excludes>
<fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
</fileSet>
+
+ <fileSet>
+ <directory>target/projects</directory>
+ <lineEnding>keep</lineEnding>
+ <outputDirectory>projects/xcode</outputDirectory>
+
+ <includes>
+ <include>*.xcodeproj/project.pbxproj</include>
+ </includes>
+
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
</fileSets>
</assembly>