Author: tschoening
Date: Fri Mar 25 18:37:33 2016
New Revision: 1736640

URL: http://svn.apache.org/viewvc?rev=1736640&view=rev
Log:
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.

Modified:
    incubator/log4cxx/trunk/src/assembly/source.xml

Modified: incubator/log4cxx/trunk/src/assembly/source.xml
URL: 
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/assembly/source.xml?rev=1736640&r1=1736639&r2=1736640&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/assembly/source.xml (original)
+++ incubator/log4cxx/trunk/src/assembly/source.xml Fri Mar 25 18:37:33 2016
@@ -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