Author: svn-role Date: Sat Mar 7 04:02:11 2015 New Revision: 1664789 URL: http://svn.apache.org/r1664789 Log: Merge the 1.7.x-buildfix-neon branch:
* ^/subversion/branches/1.7.x-buildfix-neon Fix building neon when passing an absolute path to gen-make.py Justification: Don't create invalid paths in generated project files as those will just produce unreadable errors. See http://ci.apache.org/builders/svn-windows-local/builds/1617/steps/Build/logs/stdio "System.InvalidOperationException: The item metadata "%(FullPath)" cannot be applied to the path "D:\local\svn-local\build\D:\local\svn-local\deps\build\neon\neon.vcxproj". The given path's format is not supported." Branch: ^/subversion/branches/1.7.x-buildfix-neon Votes: +1: rhuijben, stefan2, stsp Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/build/generator/gen_vcnet_vcproj.py Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 7 04:02:11 2015 @@ -1,6 +1,7 @@ /subversion/1.7.x-issue4059:1239661-1239744 /subversion/branches/1.5.x-r30215:870312 /subversion/branches/1.7.x-JavaHL-pools:1158684-1158722 +/subversion/branches/1.7.x-buildfix-neon:1660567-1664788 /subversion/branches/1.7.x-diff-translate:1568403-1569065 /subversion/branches/1.7.x-disable_zlib_asm:1593915-1615219 /subversion/branches/1.7.x-fsfs-commit:1536760-1541380 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1664789&r1=1664788&r2=1664789&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Sat Mar 7 04:02:11 2015 @@ -172,17 +172,3 @@ Veto-blocked changes: Approved changes: ================= - - * ^/subversion/branches/1.7.x-buildfix-neon - Fix building neon when passing an absolute path to gen-make.py - Justification: - Don't create invalid paths in generated project files as those - will just produce unreadable errors. - See http://ci.apache.org/builders/svn-windows-local/builds/1617/steps/Build/logs/stdio - "System.InvalidOperationException: The item metadata "%(FullPath)" cannot be applied - to the path "D:\local\svn-local\build\D:\local\svn-local\deps\build\neon\neon.vcxproj". - The given path's format is not supported." - Branch: - ^/subversion/branches/1.7.x-buildfix-neon - Votes: - +1: rhuijben, stefan2, stsp Modified: subversion/branches/1.7.x/build/generator/gen_vcnet_vcproj.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/gen_vcnet_vcproj.py?rev=1664789&r1=1664788&r2=1664789&view=diff ============================================================================== --- subversion/branches/1.7.x/build/generator/gen_vcnet_vcproj.py (original) +++ subversion/branches/1.7.x/build/generator/gen_vcnet_vcproj.py Sat Mar 7 04:02:11 2015 @@ -201,6 +201,8 @@ class Generator(gen_win.WinGeneratorBase for i in range(len(depends)): if depends[i].fname.startswith(self.projfilesdir): path = depends[i].fname[len(self.projfilesdir) + 1:] + elif os.path.isabs(depends[i].fname): + path = depends[i].fname else: path = '$(SolutionDir)' + depends[i].fname deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],