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.



Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/f8714610
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/f8714610
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/f8714610

Branch: refs/heads/master
Commit: f8714610780f6748f5a58fe1b3bab137ffe4a0c1
Parents: a2d0918
Author: Thorsten Schöning <[email protected]>
Authored: Fri Mar 25 18:37:33 2016 +0000
Committer: Thorsten Schöning <[email protected]>
Committed: Fri Mar 25 18:37:33 2016 +0000

----------------------------------------------------------------------
 src/assembly/source.xml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f8714610/src/assembly/source.xml
----------------------------------------------------------------------
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>
 

Reply via email to