You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 20:06:33 UTC
svn commit: r984153 [2/39] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/hudson/ build/hudson/jobs/subversion-1.6.x-solaris/
build/hudson/jobs/subversion-1.6.x-ubuntu/ build/hud...
Modified: subversion/branches/ignore-mergeinfo/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/CHANGES?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/CHANGES (original)
+++ subversion/branches/ignore-mergeinfo/CHANGES Tue Aug 10 18:06:17 2010
@@ -1,6 +1,37 @@
-Version 1.6.8
-(15 Jan 2010, from /branches/1.6.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.6.8
+Version 1.6.10
+(02 Apr 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.10
+
+ User-visible changes:
+ * fix for repositories mounted via NFS (issue #3501)
+ * enable TCP keep-alives in svnserve (r880552)
+ * tighten restrictions on revprops for 'svnadmin verify' (r904594)
+ * make ra_serf give better out-of-date information (issue #3561)
+ * improve error message upon connection failure with svn+ssh:// (r922516)
+ * allow 'svn log' on an uncommitted copy/move destination (r901752)
+ * make 'svnadmin hotcopy' copy the fsfs config file (r905303)
+ * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)
+ * make mergeinfo queries not require access to the repo root (issue #3242)
+ * update URLs to refer the the new apache.org repository (r904301, -94)
+ * update relative externals during a switch (issue #3390)
+ * fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85)
+ * improve wc-ng working copy detection (r929382)
+ * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' (r917640, -8211)
+ * fixed: file external from URL cannot overwrite existing item (issue #3552)
+ * fixed: potential memory error in 'svn status' (r923674, -9)
+ * fixed: merge records mergeinfo from natural history gaps (issue #3432)
+ * fixed: theoretical possibility of DB corruption (r926151, -67)
+
+ Developer-visible changes:
+ * disable checks for wc-ng working copies when running the test suite
+ * on Windows, don't ignore move operation error codes (r896915)
+ * more precise reporting of errors occuring with sqlite init (r927323, -8)
+ * ensure rangelist APIs are commutative (r923389, -91)
+
+
+Version 1.6.9
+(25 Jan 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.9
User-visible changes:
* allow multiple external updates over ra_svn (issue #3487)
@@ -16,14 +47,19 @@ http://svn.apache.org/repos/asf/subversi
* fixed: svnsync leaves stale sync-locks on mirrors (r884842)
* fix applicability of 'svn resolve --accept=theirs-conflict' (r880525, -6)
* fixed: segfault in 'svn resolve' (r896522, -47)
+ * fix commit failure against an out-of-date mirror (r900797)
Developer-visible changes:
* update ruby bindings test expectation (r880162)
* don't allow rangelist and mergeinfo API to modify input args (r879093)
+Version 1.6.8
+(Not released, see changes for 1.6.9.)
+
+
Version 1.6.7
-(Not released, see changes for 1.6.8.)
+(Not released, see changes for 1.6.9.)
[ Note: All revision numbers for versions prior to 1.6.7 reference the
@@ -33,7 +69,7 @@ Version 1.6.7
Version 1.6.6
(22 Oct 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.6
+http://svn.apache.org/repos/asf/subversion/tags/1.6.6
User-visible changes:
* fix crash during 'svn update' (r39673)
@@ -64,7 +100,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.5
(22 Aug 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.5
+http://svn.apache.org/repos/asf/subversion/tags/1.6.5
User-visible changes:
* fix mod_dav_svn directory view links to preserve peg revisions (r38021)
@@ -92,17 +128,17 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.4
(06 Aug 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.4
+http://svn.apache.org/repos/asf/subversion/tags/1.6.4
User-visible changes:
* fixed: heap overflow vulnerability on server and client
See CVE-2009-2411, and descriptive advisory at
- http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+ http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
Version 1.6.3
(22 Jun 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.3
+http://svn.apache.org/repos/asf/subversion/tags/1.6.3
User-visible changes:
* fix segfault in WC->URL copy (r37646, -56)
@@ -139,7 +175,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.2
(11 May 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.2
+http://svn.apache.org/repos/asf/subversion/tags/1.6.2
User-visible changes:
* vastly improve memory usage with 'svn merge' (issue #3393)
@@ -169,7 +205,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.1
(9 Apr 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.1
+http://svn.apache.org/repos/asf/subversion/tags/1.6.1
User-visible changes:
* recommend Neon 0.28.4. (r36388)
@@ -211,7 +247,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.0
(20 Mar 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.0
+http://svn.apache.org/repos/asf/subversion/tags/1.6.0
User-visible changes:
- General:
@@ -315,17 +351,17 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.5.7
(06 Aug 2009, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.7
+http://svn.apache.org/repos/asf/subversion/tags/1.5.7
User-visible changes:
* fixed: heap overflow vulnerability on server and client
See CVE-2009-2411, and descriptive advisory at
- http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+ http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
Version 1.5.6
(26 Feb 2009, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.6
+http://svn.apache.org/repos/asf/subversion/tags/1.5.6
User-visible changes:
* allow colons within mergeinfo path names (r35040)
@@ -347,7 +383,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.5
(22 Dec 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.5
+http://svn.apache.org/repos/asf/subversion/tags/1.5.5
User-visible changes:
* allow prop commits on dirs with modified children (r34487, -92, -94)
@@ -375,7 +411,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.4
(24 Oct 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.4
+http://svn.apache.org/repos/asf/subversion/tags/1.5.4
User-visible changes:
* Properly handle explicit mergeinfo added in merge source (r32968, -75)
@@ -385,7 +421,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.3
(10 Oct 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.3
+http://svn.apache.org/repos/asf/subversion/tags/1.5.3
User-visible changes:
* Allow switch to continue after deleting locally modified dirs (issue #2505)
@@ -412,7 +448,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.2
(30 Aug 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.2
+http://svn.apache.org/repos/asf/subversion/tags/1.5.2
User-visible changes:
* Set correct permissions on created fsfs shards (r32355, -7)
@@ -443,7 +479,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.1
(26 Jul 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.1
+http://svn.apache.org/repos/asf/subversion/tags/1.5.1
User-visible changes:
* mergeinfo on switched subtrees should elide in repos (issue #3188)
@@ -488,7 +524,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.5.0
(19 Jun 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.0
+http://svn.apache.org/repos/asf/subversion/tags/1.5.0
User-visible changes:
- Major new features:
@@ -706,7 +742,7 @@ http://svn.collab.net/repos/svn/tags/1.5
Version 1.4.6
(21 Dec 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.6
+http://svn.apache.org/repos/asf/subversion/tags/1.4.6
User-visible changes:
- Client:
@@ -748,17 +784,17 @@ http://svn.collab.net/repos/svn/tags/1.4
Version 1.4.5
(27 Aug 2007, from /branches/1.4.5)
-http://svn.collab.net/repos/svn/tags/1.4.5
+http://svn.apache.org/repos/asf/subversion/tags/1.4.5
User-visible changes:
* fixed: file placement vulnerability (Win32 clients only)
See CVE-2007-3846, and descriptive advisory at
- http://subversion.tigris.org/security/CVE-2007-3846-advisory.txt
+ http://subversion.apache.org/security/CVE-2007-3846-advisory.txt
Version 1.4.4
(30 May 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.4
+http://svn.apache.org/repos/asf/subversion/tags/1.4.4
User-visible changes:
- Client:
@@ -802,7 +838,7 @@ http://svn.collab.net/repos/svn/tags/1.4
Version 1.4.3
(18 January 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.3
+http://svn.apache.org/repos/asf/subversion/tags/1.4.3
User-visible changes:
- Client:
@@ -839,7 +875,7 @@ http://svn.collab.net/repos/svn/tags/1.4
Version 1.4.2
(2 November 2006, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.2
+http://svn.apache.org/repos/asf/subversion/tags/1.4.2
User-visible changes:
- Client:
@@ -895,7 +931,7 @@ Version 1.4.1
Version 1.4.0
(10 September 2006, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.0
+http://svn.apache.org/repos/asf/subversion/tags/1.4.0
User-visible changes:
- Client:
@@ -1066,7 +1102,7 @@ http://svn.collab.net/repos/svn/tags/1.4
Version 1.3.2
(23 May 2006, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.2
+http://svn.apache.org/repos/asf/subversion/tags/1.3.2
User-visible changes:
- Client:
@@ -1098,7 +1134,7 @@ http://svn.collab.net/repos/svn/tags/1.3
Version 1.3.1
(25 March 2006, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.1
+http://svn.apache.org/repos/asf/subversion/tags/1.3.1
User-visible changes:
- Client:
@@ -1149,7 +1185,7 @@ http://svn.collab.net/repos/svn/tags/1.3
Version 1.3.0
(30 December 2005, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.0
+http://svn.apache.org/repos/asf/subversion/tags/1.3.0
User-visible changes:
- Client:
@@ -1250,7 +1286,7 @@ http://svn.collab.net/repos/svn/tags/1.3
Version 1.2.3
(19 August 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.3
+http://svn.apache.org/repos/asf/subversion/tags/1.2.3
User-visible changes:
- Client:
@@ -1296,7 +1332,7 @@ Version 1.2.2
Version 1.2.1
(5 July 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.1
+http://svn.apache.org/repos/asf/subversion/tags/1.2.1
User-visible changes:
- Client:
@@ -1329,10 +1365,10 @@ http://svn.collab.net/repos/svn/tags/1.2
Version 1.2.0
(21 May 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.0
+http://svn.apache.org/repos/asf/subversion/tags/1.2.0
See the 1.2 release notes for a more verbose overview of the changes since
-the 1.1 release: http://subversion.tigris.org/svn_1.2_releasenotes.html
+the 1.1 release: http://subversion.apache.org/docs/release-notes/1.2.html
User-visible changes:
- Client:
@@ -1478,7 +1514,7 @@ the 1.1 release: http://subversion.tigr
Version 1.1.4
(1 April 2005, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.4
+http://svn.apache.org/repos/asf/subversion/tags/1.1.4
User-visible changes:
- Client:
@@ -1512,7 +1548,7 @@ http://svn.collab.net/repos/svn/tags/1.1
Version 1.1.3
(14 January 2005, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.3
+http://svn.apache.org/repos/asf/subversion/tags/1.1.3
User-visible changes:
- Client:
@@ -1524,7 +1560,7 @@ http://svn.collab.net/repos/svn/tags/1.1
Version 1.1.2
(20 December 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.2
+http://svn.apache.org/repos/asf/subversion/tags/1.1.2
User-visible changes:
- Client:
@@ -1577,7 +1613,7 @@ http://svn.collab.net/repos/svn/tags/1.1
Version 1.1.1
(22 October 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.1
+http://svn.apache.org/repos/asf/subversion/tags/1.1.1
User-visible changes:
- Client:
@@ -1612,7 +1648,7 @@ http://svn.collab.net/repos/svn/tags/1.1
Version 1.0.9
(13 October 2004, from /branches/1.0.9)
-http://svn.collab.net/repos/svn/tags/1.0.9
+http://svn.apache.org/repos/asf/subversion/tags/1.0.9
User-visible changes:
- Server:
@@ -1625,10 +1661,10 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.1.0
(29 September 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.0
+http://svn.apache.org/repos/asf/subversion/tags/1.1.0
See the 1.1 release notes for a more verbose overview of the changes since
-1.0.x: http://subversion.tigris.org/svn_1.1_releasenotes.html
+1.0.x: http://subversion.apache.org/docs/release-notes/1.1.html
User-visible changes:
* new non-database repository back-end (libsvn_fs_fs)
@@ -1753,17 +1789,17 @@ See the 1.1 release notes for a more ver
Version 1.0.8
(22 September 2004, from /branches/1.0.8)
-http://svn.collab.net/repos/svn/tags/1.0.8
+http://svn.apache.org/repos/asf/subversion/tags/1.0.8
User-visible changes:
* fixed: mod_authz_svn path and log-message metadata leaks.
See CAN-2004-0749, and descriptive advisory at
- http://subversion.tigris.org/security/CAN-2004-0749-advisory.txt
+ http://subversion.apache.org/security/CAN-2004-0749-advisory.txt
Version 1.0.7
(17 September 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.7
+http://svn.apache.org/repos/asf/subversion/tags/1.0.7
User-visible changes:
* fixed: win32 'file not found' error [issue #1862]
@@ -1782,7 +1818,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.6
(19 July 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.6
+http://svn.apache.org/repos/asf/subversion/tags/1.0.6
User-visible changes:
* fixed: crash in status command, caused by race (r10144)
@@ -1796,7 +1832,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.5
(10 Jun 2004, from /branches/1.0.5)
-http://svn.collab.net/repos/svn/tags/1.0.5
+http://svn.apache.org/repos/asf/subversion/tags/1.0.5
User-visible changes:
* fixed: security bug in svn protocol string parsing. (CAN-2004-0413)
@@ -1804,7 +1840,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.4
(21 May 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.4
+http://svn.apache.org/repos/asf/subversion/tags/1.0.4
User-visible changes:
* fixed: 'svn up' can delete unversioned data on win32 fs (issue #1854)
@@ -1823,7 +1859,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.3
(19 May 2004, from /branches/1.0.3)
-http://svn.collab.net/repos/svn/tags/1.0.3
+http://svn.apache.org/repos/asf/subversion/tags/1.0.3
User-visible changes:
* fixed: security bug in date parsing. (CAN-2004-0397)
@@ -1831,7 +1867,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.2
(15 April 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.2
+http://svn.apache.org/repos/asf/subversion/tags/1.0.2
User-visible changes:
* fixed: segfault when remotely deleting svn:author property.
@@ -1856,7 +1892,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.1
(12 March 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.1
+http://svn.apache.org/repos/asf/subversion/tags/1.0.1
User-visible changes:
* allow anonymous access checking in mod_authz_svn
@@ -1902,7 +1938,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 1.0.0
(branching 23 February 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.0
+http://svn.apache.org/repos/asf/subversion/tags/1.0.0
User-visible changes:
* fixes to the shbang lines in tools/hook-scripts/.
@@ -1926,7 +1962,7 @@ http://svn.collab.net/repos/svn/tags/1.0
Version 0.37.0 [Beta Interim 2]
(branching 24 January 2004, from /branches/1.0-stabilization)
-http://svn.collab.net/repos/svn/tags/0.37.0
+http://svn.apache.org/repos/asf/subversion/tags/0.37.0
User-visible changes:
* bugfix: buffer overflow for AIX client
@@ -1953,7 +1989,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.36.0 [Beta Interim 1]
(branching 13 January 2004, from /branches/1.0-stabilization)
-http://svn.collab.net/repos/svn/tags/0.36.0
+http://svn.apache.org/repos/asf/subversion/tags/0.36.0
User-visible changes:
* add cancellation support to svnadmin and svnlook (r8222)
@@ -1989,7 +2025,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.35.1 [Beta] (branching 19 December 2003, from /tags/0.35.0)
-http://svn.collab.net/repos/svn/tags/0.35.1
+http://svn.apache.org/repos/asf/subversion/tags/0.35.1
NOTICES:
@@ -2001,7 +2037,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.35.0 (branching 12 December 2003, from revision 7994)
-http://svn.collab.net/repos/svn/branches/0.35.0
+http://svn.apache.org/repos/asf/subversion/branches/0.35.0
NOTICES:
@@ -2034,7 +2070,7 @@ http://svn.collab.net/repos/svn/branches
Version 0.34.0 (released 3 December 2003, from revision r7859)
-http://svn.collab.net/repos/svn/tags/0.34.0
+http://svn.apache.org/repos/asf/subversion/tags/0.34.0
#####################################################################
## WARNING WARNING WARNING WARNING WARNING WARNING WARNING ##
@@ -2056,7 +2092,7 @@ http://svn.collab.net/repos/svn/tags/0.3
pre-0.34.0 repos to 0.34.0.
That document is also located here:
- http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+ http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
User-visible changes:
* fs schema change (#1578, #1595) **NOTE: repos dump/load cycle required!**
@@ -2079,7 +2115,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.33.1 (released 17 November 2003, revision r7782)
-http://svn.collab.net/repos/svn/tags/0.33.1
+http://svn.apache.org/repos/asf/subversion/tags/0.33.1
NOTICE: This is a bugfix release. The bug is fixed if *either*
the client or server uses the new code.
@@ -2089,7 +2125,7 @@ User-visible changes:
Version 0.33.0 (released 13 November 2003, revision r7737)
-http://svn.collab.net/repos/svn/tags/0.33.0
+http://svn.apache.org/repos/asf/subversion/tags/0.33.0
NOTICES:
@@ -2140,7 +2176,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.32.1 (released 23 October 2003, revision 7497)
-http://svn.collab.net/repos/svn/tags/0.32.1
+http://svn.apache.org/repos/asf/subversion/tags/0.32.1
NOTICE: This release is to correct for the problems in the 0.32.0
release. There are no user or developer changes in this release
@@ -2151,7 +2187,7 @@ http://svn.collab.net/repos/svn/tags/0.3
compatibility break with Subversions older than 0.28.0.
Version 0.32.0 (released 22 October 2003, revision 7480)
-http://svn.collab.net/repos/svn/tags/0.32.0
+http://svn.apache.org/repos/asf/subversion/tags/0.32.0
NOTICE: This release of Subversion causes an ra_dav client/server
compatibility break with Subversions older than 0.28.0.
@@ -2185,7 +2221,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.31.0 (released 08 October 2003, revision 7355)
-http://svn.collab.net/repos/svn/tags/0.31.0
+http://svn.apache.org/repos/asf/subversion/tags/0.31.0
User-visible changes:
* new 'svnlook history' command (and removal of 'svnadmin lscr').
@@ -2226,7 +2262,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.30.0 (released 24 Sep 2003, revision 7178)
-http://svn.collab.net/repos/svn/tags/0.30.0
+http://svn.apache.org/repos/asf/subversion/tags/0.30.0
User-visible changes:
* SSL changes: (r7134, #1330)
@@ -2261,7 +2297,7 @@ http://svn.collab.net/repos/svn/tags/0.3
Version 0.29.0 (released 05 Sep 2003, revision 6976)
-http://svn.collab.net/repos/svn/tags/0.29.0
+http://svn.apache.org/repos/asf/subversion/tags/0.29.0
User-visible changes:
* 'svn status' now streams its response. (r6913, #1426)
@@ -2289,7 +2325,7 @@ http://svn.collab.net/repos/svn/tags/0.2
Version 0.28.2 (released 29 Aug 2003, revision 6946)
-http://svn.collab.net/repos/svn/tags/0.28.2
+http://svn.apache.org/repos/asf/subversion/tags/0.28.2
User-visible changes:
* MAJOR BUGFIX: revert revision 6764.
@@ -2303,7 +2339,7 @@ http://svn.collab.net/repos/svn/tags/0.2
Version 0.28.1
-(released 28 Aug 2003,http://svn.collab.net/repos/svn/tags/0.28.1)
+(released 28 Aug 2003,http://svn.apache.org/repos/asf/subversion/tags/0.28.1)
There are no changes in this release.
It is strictly an updated release, build with the correct version
@@ -2311,7 +2347,7 @@ Version 0.28.1
Version 0.28.0 (released 27 August 2003, rev 6894, branches/release-0.28)
-(http://svn.collab.net/repos/svn/tags/0.28)
+(http://svn.apache.org/repos/asf/subversion/tags/0.28)
#####################################################################
## WARNING WARNING WARNING WARNING WARNING WARNING WARNING ##
@@ -2334,7 +2370,7 @@ Version 0.28.0 (released 27 August 2003,
pre-0.28.0 repos to 0.28.0.
That document is also located here:
- http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+ http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
User-visible changes:
* fs schema change, see issue #1003 **NOTE: repos dump/load cycle required!**
@@ -3130,7 +3166,7 @@ Version 0.13.0 [Pre-Alpha] (released 10
User-visible changes:
* repositories have a new database schema; existing ones must be upgraded!
- new svnadmin 'dump'/'load' commands to migrate repositories
- - read http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+ - read http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
Developer-visible changes:
* complete rewrite of filesystem schema!
Modified: subversion/branches/ignore-mergeinfo/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/COMMITTERS?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] Tue Aug 10 18:06:17 2010
@@ -4,7 +4,7 @@ for that, you'd need to look over the lo
patch contributors.
If you have a question or comment, it's probably best to mail
-dev@subversion.tigris.org, rather than mailing any of these people
+dev@subversion.apache.org, rather than mailing any of these people
directly.
Blanket commit access:
@@ -131,7 +131,7 @@ Commit access for specific areas:
build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
- mattiase Mattias Engdegård <ma...@virtutech.com> (dsvn.el)
+ mattiase Mattias Engdegård <ma...@acm.org> (dsvn.el)
dustin Dustin J. Mitchell <du...@zmanda.com> (svnmerge)
rocketraman Raman Gupta <ro...@fastmail.fm> (svnmerge)
rhansen Richard Hansen <rh...@bbn.com> (svnstsw)
@@ -175,6 +175,8 @@ giorgio_valoti Giorgio Valoti <giorgio
cacknin Charles Acknin <ch...@gmail.com> (svnpatch-diff
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
+ dannas Daniel Näslund <da...@elego.de> (svn-patch-
+ improvements br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/ignore-mergeinfo/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/INSTALL?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/INSTALL (original)
+++ subversion/branches/ignore-mergeinfo/INSTALL Tue Aug 10 18:06:17 2010
@@ -55,7 +55,7 @@ I. INTRODUCTION
'installers' for both Windows and OS X. Visit this page for
package links:
- http://subversion.tigris.org/project_packages.html
+ http://subversion.apache.org/packages.html
For those of you who still wish to build from source, Subversion
follows the Unix convention of "./configure && make", but it has
@@ -1468,7 +1468,7 @@ IV. PLATFORM-SPECIFIC ISSUES
And there's an item about this in the Subversion FAQ:
- http://subversion.tigris.org/faq.html#windows-xp-server
+ http://subversion.apache.org/faq.html#windows-xp-server
The only known workaround for now is to update to Windows XP
SP1 (or higher).
Modified: subversion/branches/ignore-mergeinfo/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/LICENSE?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/LICENSE (original)
+++ subversion/branches/ignore-mergeinfo/LICENSE Tue Aug 10 18:06:17 2010
@@ -200,3 +200,63 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+SUBVERSION SUBCOMPONENTS:
+
+Subversion includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+For portions of the Python bindings test suite at
+subversion/bindings/swig/python/tests/trac/:
+
+ I. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ II. Copyright (C) 2003, 2004, 2005 Edgewall Software
+ Copyright (C) 2003, 2004, 2005 Jonas Borgström <jo...@edgewall.com>
+ Copyright (C) 2005 Christopher Lenz <cm...@gmx.de>
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: subversion/branches/ignore-mergeinfo/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/Makefile.in?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/Makefile.in (original)
+++ subversion/branches/ignore-mergeinfo/Makefile.in Tue Aug 10 18:06:17 2010
@@ -322,9 +322,11 @@ JAVAC_FLAGS = @JAVAC_FLAGS@
JAVAH = @JAVAH@
JAR = @JAR@
-JAVA_CLASSPATH=@JAVA_CLASSPATH@
+JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
javahl_java_CLASSPATH=$(JAVA_CLASSPATH)
+javahl_compat_CLASSPATH=$(JAVA_CLASSPATH)
javahl_tests_CLASSPATH=$(JAVA_CLASSPATH)
+javahl_compat_tests_CLASSPATH=$(JAVA_CLASSPATH)
RUBY = @RUBY@
RUBY_MAJOR = @RUBY_MAJOR@
@@ -336,6 +338,8 @@ ECHO_N = @ECHO_N@
TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
+TRUNK_TRAIL_URL = /repos/asf/subversion/trunk
+
all: mkdir-init external-all local-all
clean: external-clean local-clean
distclean: external-distclean local-distclean
@@ -406,22 +410,23 @@ local-install: @INSTALL_RULES@
### HACK!! Find a better way to do this
revision-install:
- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
- svnversion $(top_srcdir) /repos/svn/trunk > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
- echo "unknown" > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- fi; \
+ subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ if test "$$?" != "0"; then \
+ svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ if test "$$?" != "0"; then \
+ echo "unknown" > \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
+ fi; \
fi;
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@
install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
+javahl-compat: javahl-compat-java javahl @JAVAHL_COMPAT_TESTS_TARGET@
clean-javahl:
rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@
@@ -430,14 +435,18 @@ clean-javahl:
rm -f $(libsvnjavahl_PATH)/*.lo
rm -f $(libsvnjavahl_PATH)/*.o
+check-javahl-compat: javahl-compat-tests javahl-compat
+ @FIX_JAVAHL_LIB@
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
+
check-javahl: javahl
@FIX_JAVAHL_LIB@
- $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
# will perform only basic tests (likewise for other tests).
-check: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
@if test "$(PYTHON)" != "none"; then \
flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
@@ -523,6 +532,7 @@ check-clean:
subversion/tests/libsvn_repos/test-repo-* \
subversion/tests/libsvn_subr/z \
subversion/tests/libsvn_wc/fake-wc \
+ subversion/tests/libsvn_client/test-patch* \
subversion/tests/svnserveautocheck.pid \
tests.log
@@ -596,7 +606,9 @@ doc-javahl:
$(JAVADOC) -d $(top_srcdir)/doc/javadoc \
-sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
-link http://java.sun.com/javase/6/docs/api/ \
- org.tigris.subversion.javahl
+ org.tigris.subversion.javahl \
+ org.apache.subversion.javahl \
+ org.apache.subversion.javahl.callback
doc-clean:
rm -rf $(top_srcdir)/doc/doxygen
@@ -828,3 +840,7 @@ clean-ctypes-python:
$(PYTHON) setup.py clean --all
extraclean-ctypes-python: clean-ctypes-python
+
+
+# manually describe a dependency, which we won't otherwise detect
+subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/branches/ignore-mergeinfo/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/NOTICE?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/NOTICE (original)
+++ subversion/branches/ignore-mergeinfo/NOTICE Tue Aug 10 18:06:17 2010
@@ -1,11 +1,11 @@
Subversion
-Copyright 2009 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
(http://www.apache.org/). See the accompanying COMMITTERS file and the
revision logs for an exact contribution history.
-Portions of the python bindings are Copyright 2005 Edgewall Software. See
-http://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
-for more information.
+Portions of the test suite for Subversion's Python bindings are copyrighted
+by Edgewall Software, Jonas Borgström and Christopher Lenz.
+For more information, see LICENSE.
Modified: subversion/branches/ignore-mergeinfo/README
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/README?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/README (original)
+++ subversion/branches/ignore-mergeinfo/README Tue Aug 10 18:06:17 2010
@@ -18,7 +18,7 @@ I. A FEW POINTERS
For an overview of the Subversion project, visit
- http://subversion.tigris.org/
+ http://subversion.apache.org/
Once you have a Subversion client you can get the latest version
of the code with the command:
@@ -50,7 +50,7 @@ III. PARTICIPATING IN THE SUBVERSION CO
Talk on IRC with developers: irc.freenode.net, channel #svn-dev.
- Read the FAQ: http://subversion.tigris.org/faq.html
+ Read the FAQ: http://subversion.apache.org/faq.html
Modified: subversion/branches/ignore-mergeinfo/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build.conf?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build.conf (original)
+++ subversion/branches/ignore-mergeinfo/build.conf Tue Aug 10 18:06:17 2010
@@ -49,28 +49,14 @@ private-built-includes =
subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
subversion/bindings/swig/proxy/rubyhead.swg
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_CommitItemStateFlags.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictResult.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_Depth.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_LockStatus.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_NodeKind.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyAction.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_NotifyStatus.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_NativeResources.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_Operation.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_Path.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_PromptUserPassword2.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_Revision.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_RevisionKind.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNAdmin.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClient.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_SVNClientLogLevel.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_ScheduleKind.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_StatusKind.h
- subversion/bindings/javahl/include/org_tigris_subversion_javahl_Version.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_Revision.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNAdmin.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_Version.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
test-scripts =
@@ -222,7 +208,7 @@ type = lib
path = subversion/libsvn_diff
libs = libsvn_subr apriconv apr
install = lib
-msvc-export = svn_diff.h private/svn_diff_private.h
+msvc-export = svn_diff.h
# The repository filesystem library
[libsvn_fs]
@@ -376,11 +362,11 @@ type = sql-header
path = subversion/libsvn_fs_fs
sources = rep-cache-db.sql
-[wc_metadata]
-description = Schema for the WC database
+[revprops]
+description = Schema for revprop packing
type = sql-header
-path = subversion/libsvn_wc
-sources = wc-metadata.sql
+path = subversion/libsvn_fs_fs
+sources = revprops-db.sql
[wc_queries]
desription = Queries on the WC database
@@ -523,18 +509,30 @@ msvc-static = no
#
[javahl-java]
type = java
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
+src-root = subversion/bindings/javahl/src
+sources = *.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
+classes = subversion/bindings/javahl/classes
+package-roots = org
+
+[javahl-compat-java]
+type = java
path = subversion/bindings/javahl/src/org/tigris/subversion/javahl
sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_JAVAC)
classes = subversion/bindings/javahl/classes
+add-deps = $(javahl_java_DEPS)
### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
#jar = svn-javahl.jar
package-roots = org
[javahl-tests]
type = java
-path = subversion/bindings/javahl/tests/org/tigris/subversion/javahl
+path = subversion/bindings/javahl/tests/org/apache/subversion/javahl
sources = *.java
install = javahl-java
link-cmd = $(COMPILE_JAVAHL_JAVAC)
@@ -542,13 +540,37 @@ classes = subversion/bindings/javahl/cla
package-roots = org
### Java targets don't do up-to-date checks yet.
#add-deps = javahl-java
+add-deps = $(javahl_java_DEPS)
+
+[javahl-compat-tests]
+type = java
+path = subversion/bindings/javahl/tests/org/tigris/subversion/javahl
+sources = *.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
+classes = subversion/bindings/javahl/classes
+package-roots = org
+### Java targets don't do up-to-date checks yet.
+#add-deps = javahl-compat-java
+add-deps = $(javahl_compat_java_DEPS)
+
+[javahl-callback-javah]
+type = javah
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
+classes = subversion/bindings/javahl/classes
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl.callback
+sources = *.java
+add-deps = $(javahl_java_DEPS)
+install = javahl-javah
+link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
[javahl-javah]
type = javah
-path = subversion/bindings/javahl/src/org/tigris/subversion/javahl
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl
classes = subversion/bindings/javahl/classes
headers = subversion/bindings/javahl/include
-package = org.tigris.subversion.javahl
+package = org.apache.subversion.javahl
sources = *.java
add-deps = $(javahl_java_DEPS)
install = javahl-javah
@@ -561,7 +583,7 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr neon
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
@@ -852,7 +874,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr libsvn_ra libsvn_client apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4 Tue Aug 10 18:06:17 2010
@@ -156,9 +156,9 @@ AC_DEFUN(SVN_FIND_JDK,
# The release for "-source" could actually be greater than that
# of "-target", if we want to cross-compile for lesser JVMs.
if test -z "$JAVAC_FLAGS"; then
- JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.3"
+ JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.5"
if test "$enable_debugging" = "yes"; then
- JAVAC_FLAGS="-g $JAVAC_FLAGS"
+ JAVAC_FLAGS="-g -Xlint:unchecked $JAVAC_FLAGS"
fi
fi
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 Tue Aug 10 18:06:17 2010
@@ -209,7 +209,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
# Ruby doesn't like '-ansi', so strip that out of CFLAGS
- svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
+ svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g;s/ -std=c89//g"`"
])
SWIG_RB_COMPILE="$svn_cv_ruby_compile"
Modified: subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt Tue Aug 10 18:06:17 2010
@@ -1,36 +1,36 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-
-
-@echo off
-@rem **************************************************************************
-cd ..\..\subversion\po
-mkdir ..\..\%1\mo
-set exitcode=0
-[for pofiles]echo Running msgfmt on [pofiles.po]...
-python ..\..\build\strip-po-charset.py [pofiles.po] [pofiles.spo]
-if not errorlevel 0 goto err
-msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.spo]
-if not errorlevel 0 goto err
-del [pofiles.spo]
-[end]
-goto end
-@rem **************************************************************************
-:err
-set exitcode=1
-:end
-exit %exitcode%
+@rem Licensed to the Apache Software Foundation (ASF) under one
+@rem or more contributor license agreements. See the NOTICE file
+@rem distributed with this work for additional information
+@rem regarding copyright ownership. The ASF licenses this file
+@rem to you under the Apache License, Version 2.0 (the
+@rem "License"); you may not use this file except in compliance
+@rem with the License. You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing,
+@rem software distributed under the License is distributed on an
+@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem KIND, either express or implied. See the License for the
+@rem specific language governing permissions and limitations
+@rem under the License.
+
+
+@echo off
+@rem **************************************************************************
+cd ..\..\subversion\po
+mkdir ..\..\%1\mo
+set exitcode=0
+[for pofiles]echo Running msgfmt on [pofiles.po]...
+python ..\..\build\strip-po-charset.py [pofiles.po] [pofiles.spo]
+if not errorlevel 0 goto err
+msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.spo]
+if not errorlevel 0 goto err
+del [pofiles.spo]
+[end]
+goto end
+@rem **************************************************************************
+:err
+set exitcode=1
+:end
+exit %exitcode%
Propchange: subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/build_zlib.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/build_zlib.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/build_zlib.ezt Tue Aug 10 18:06:17 2010
@@ -1,80 +1,101 @@
-@echo off
-@rem **************************************************************************
-@rem * --== WARNING ==-- This is a generated file. Do not edit!
-@rem *
-@rem * From this directory, run this batch file like so:
-@rem *
-@rem * .\build_zlib debug|release (rebuild)
-@rem *
-@rem **************************************************************************
-
-@rem **************************************************************************
-cd /D [zlib_path]
-set exitcode=0
-[if-any use_ml]
-@rem **************************************************************************
-@rem Compile ASM sources with ML
-set ASFLAGS=-nologo -Zi -coff
-set LOC=-DASMV -DASMINF
-set OBJA=gvmat32c.obj gvmat32.obj inffas32.obj
-set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
-if not exist gvmat32c.c copy contrib\masmx86\gvmat32c.c .
-if not exist gvmat32.asm copy contrib\masmx86\gvmat32.asm .
-if not exist inffas32.asm copy contrib\masmx86\inffas32.asm .[end]
-
-if "%1" == "release" goto release
-if "%1" == "debug" goto debug
-goto pIerr
-
-:checkrebuild
-if "%2" == "rebuild" goto rebuild
-if "%2" == "clean" goto clean
-if not "%2" == "" goto pIIerr
-set target= %STATICLIB%
-goto build
-
-:rebuild
-set target=clean %STATICLIB%
-goto build
-
-:clean
-set target=clean
-goto build
-
-@rem **************************************************************************
-:release
-set STATICLIB=zlibstat.lib
-set CC_OPTS=/MD /O2 /Zi
-goto checkrebuild
-
-@rem **************************************************************************
-:debug
-set STATICLIB=zlibstatD.lib
-set CC_OPTS=/MDd /Gm /Gi /ZI /Od /GZ /D_DEBUG
-goto checkrebuild
-
-@rem **************************************************************************
-:build
-set COMMON_CC_OPTS=/nologo /W3 /FD /GX /DWIN32 /D_WINDOWS
-set CFLAGS=%COMMON_CC_OPTS% %CC_OPTS% $(LOC)
-set BUILD_OPTS=%ASM_OPTS% CFLAGS="%COMMON_CC_OPTS% %CC_OPTS% $(LOC)"
-@echo nmake /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
-nmake /nologo /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
-if not errorlevel 0 goto err
-goto end
-
-@rem **************************************************************************
-:pIerr
-echo error: First parameter should be "release" or "debug"
-goto err
-
-@rem **************************************************************************
-:pIIerr
-echo error: Second parameter should be "rebuild" or empty
-goto err
-
-@rem **************************************************************************
-:err
-set exitcode=1
-:end
-exit %exitcode%
+[define COPYRIGHT]
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+[end]@echo off
+@rem **************************************************************************
+@rem * --== WARNING ==-- This is a generated file. Do not edit!
+@rem *
+@rem * From this directory, run this batch file like so:
+@rem *
+@rem * .\build_zlib debug|release (rebuild)
+@rem *
+@rem **************************************************************************
+
+@rem **************************************************************************
+cd /D [zlib_path]
+set exitcode=0
+[if-any use_ml]
+@rem **************************************************************************
+@rem Compile ASM sources with ML
+set ASFLAGS=-nologo -Zi -coff
+set LOC=-DASMV -DASMINF
+set OBJA=gvmat32c.obj gvmat32.obj inffas32.obj
+set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
+if not exist gvmat32c.c copy contrib\masmx86\gvmat32c.c .
+if not exist gvmat32.asm copy contrib\masmx86\gvmat32.asm .
+if not exist inffas32.asm copy contrib\masmx86\inffas32.asm .[end]
+
+if "%1" == "release" goto release
+if "%1" == "debug" goto debug
+goto pIerr
+
+:checkrebuild
+if "%2" == "rebuild" goto rebuild
+if "%2" == "clean" goto clean
+if not "%2" == "" goto pIIerr
+set target= %STATICLIB%
+goto build
+
+:rebuild
+set target=clean %STATICLIB%
+goto build
+
+:clean
+set target=clean
+goto build
+
+@rem **************************************************************************
+:release
+set STATICLIB=zlibstat.lib
+set CC_OPTS=/MD /O2 /Zi
+goto checkrebuild
+
+@rem **************************************************************************
+:debug
+set STATICLIB=zlibstatD.lib
+set CC_OPTS=/MDd /Gm /Gi /ZI /Od /GZ /D_DEBUG
+goto checkrebuild
+
+@rem **************************************************************************
+:build
+set COMMON_CC_OPTS=/nologo /W3 /FD /GX /DWIN32 /D_WINDOWS
+set CFLAGS=%COMMON_CC_OPTS% %CC_OPTS% $(LOC)
+set BUILD_OPTS=%ASM_OPTS% CFLAGS="%COMMON_CC_OPTS% %CC_OPTS% $(LOC)"
+@echo nmake /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
+nmake /nologo /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
+if not errorlevel 0 goto err
+goto end
+
+@rem **************************************************************************
+:pIerr
+echo error: First parameter should be "release" or "debug"
+goto err
+
+@rem **************************************************************************
+:pIIerr
+echo error: Second parameter should be "rebuild" or empty
+goto err
+
+@rem **************************************************************************
+:err
+set exitcode=1
+:end
+exit %exitcode%
Propchange: subversion/branches/ignore-mergeinfo/build/generator/build_zlib.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_base.py?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_base.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_base.py Tue Aug 10 18:06:17 2010
@@ -216,9 +216,7 @@ class GeneratorBase:
import transform_sql
for hdrfile, sqlfile in self.graph.get_deps(DT_SQLHDR):
assert len(sqlfile) == 1
- transform_sql.main(open(sqlfile[0], 'r'),
- open(hdrfile, 'w'),
- os.path.basename(sqlfile[0]))
+ transform_sql.main(sqlfile[0], open(hdrfile, 'w'))
class DependencyGraph:
@@ -712,7 +710,9 @@ class TargetJavaClasses(TargetJava):
self.output_dir = self.classes
def add_dependencies(self):
- sources =_collect_paths(self.sources, self.path)
+ sources = []
+ for p in self.path.split():
+ sources.extend(_collect_paths(self.sources, p))
for src, reldir in sources:
if src[-5:] == '.java':
@@ -750,7 +750,7 @@ class TargetJavaClasses(TargetJava):
# collect all the paths where stuff might get built
### we should collect this from the dependency nodes rather than
### the sources. "what dir are you going to put yourself into?"
- self.gen_obj.target_dirs.append(self.path)
+ self.gen_obj.target_dirs.extend(self.path.split())
self.gen_obj.target_dirs.append(self.classes)
for pattern in self.sources.split():
dirname = build_path_dirname(pattern)
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py Tue Aug 10 18:06:17 2010
@@ -141,7 +141,7 @@ class Generator(gen_win.WinGeneratorBase
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(os.path.join('build', 'win32'),
'svn_config' + self.vcproj_extension,
(
('sql', sql),
@@ -180,7 +180,7 @@ class Generator(gen_win.WinGeneratorBase
for target in install_targets:
fname = self.get_external_project(target, self.vcproj_extension[1:])
if fname is None:
- fname = os.path.join(self.projfilesdir, "%s%s" %
+ fname = os.path.join(self.projfilesdir, "%s%s" %
(target.proj_name, self.vcproj_extension))
target.fname = fname
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_win.py?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_win.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_win.py Tue Aug 10 18:06:17 2010
@@ -395,7 +395,7 @@ class WinGeneratorBase(GeneratorBase):
else:
dll_targets.append(self.create_dll_target(target))
install_targets.extend(dll_targets)
-
+
for target in install_targets:
target.project_guid = self.makeguid(target.name)
@@ -480,9 +480,10 @@ class WinGeneratorBase(GeneratorBase):
jar_exe = os.path.join(self.jdk_path, "bin", jar_exe)
if not isinstance(target, gen_base.TargetProject):
- cbuild = None
- ctarget = None
for source, object, reldir in self.get_win_sources(target):
+ cbuild = None
+ ctarget = None
+ cdesc = None
if isinstance(target, gen_base.TargetJavaHeaders):
classes = self.path(target.classes)
if self.junit_path is not None:
@@ -496,6 +497,7 @@ class WinGeneratorBase(GeneratorBase):
self.quote(headers), classname)
ctarget = self.path(object.filename_win)
+ cdesc = "Generating %s" % (object.filename_win)
elif isinstance(target, gen_base.TargetJavaClasses):
classes = targetdir = self.path(target.classes)
@@ -504,12 +506,13 @@ class WinGeneratorBase(GeneratorBase):
sourcepath = self.path(source.sourcepath)
- cbuild = "%s -g -target 1.2 -source 1.3 -classpath %s -d %s " \
+ cbuild = "%s -g -target 1.5 -source 1.5 -classpath %s -d %s " \
"-sourcepath %s $(InputPath)" \
% tuple(map(self.quote, (javac_exe, classes,
targetdir, sourcepath)))
ctarget = self.path(object.filename)
+ cdesc = "Compiling %s" % (source)
rsrc = self.path(str(source))
if quote_path and '-' in rsrc:
@@ -517,6 +520,7 @@ class WinGeneratorBase(GeneratorBase):
sources.append(ProjectItem(path=rsrc, reldir=reldir, user_deps=[],
custom_build=cbuild, custom_target=ctarget,
+ custom_desc=cdesc,
extension=os.path.splitext(rsrc)[1]))
if isinstance(target, gen_base.TargetJavaClasses) and target.jar:
@@ -694,7 +698,7 @@ class WinGeneratorBase(GeneratorBase):
#
# This section parses those dependencies and adds them to the dependency list
# for this target.
- if name == 'javahl-javah' or name == 'libsvnjavahl':
+ if name[0:7] == 'javahl-' or name == 'libsvnjavahl':
for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
dep = dep.replace('_', '-')
depends.extend(self.sections[dep].get_targets())
@@ -1521,9 +1525,7 @@ class WinGeneratorBase(GeneratorBase):
os.path.join('subversion', 'libsvn_wc', 'wc-checks'),
]
for sql in sql_sources:
- transform_sql.main(open(sql + '.sql', 'r'),
- open(sql + '.h', 'w'),
- os.path.basename(sql + '.sql'))
+ transform_sql.main(sql + '.sql', open(sql + '.h', 'w'))
class ProjectItem:
Modified: subversion/branches/ignore-mergeinfo/build/generator/msvc_dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/msvc_dsp.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/msvc_dsp.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/msvc_dsp.ezt Tue Aug 10 18:06:17 2010
@@ -1,95 +1,95 @@
-# Microsoft Developer Studio Project File - Name="[target.proj_name]" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "[target_type]" [target_number]
-
-CFG=[target.proj_name] - [default_platform] [default_config]
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "[target.proj_name]_msvc.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "[target.proj_name]_msvc.mak" CFG="[target.proj_name] - [default_platform] [default_config]"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-[for platforms][for configs]!MESSAGE "[target.proj_name] - [platforms] [configs.name]" (based on "[target_type]")
-[end][end]!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-[for platforms][for configs]
-![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries [is configs.name "Debug"]1[else]0[end]
-[if-any is_external]# PROP Output_Dir "[rootpath]\[target.output_dir]\[configs.name]"
-# PROP Intermediate_Dir "[rootpath]\[target.intermediate_dir]\[configs.name]"
-# PROP Cmd_Line "cmd /c [target.cmd] [configs.lower]"
-# PROP Rebuild_Opt "rebuild"
-# PROP Target_File "[rootpath]\[target.output_dir]\[is configs.name "Debug"][target.debug][else][target.release][end]"
-# PROP Target_Dir "[rootpath]\[target.output_dir]"
-[else]# PROP Output_Dir "[rootpath]\[configs.name]\[target.output_dir]"
-# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.intermediate_dir]"
-# PROP Target_Dir ""
-[if-any is_utility][else]LIB32=link.exe -lib
-# ADD LIB32 /out:"[rootpath]\[configs.name]\[target.output_dir]\[target.output_name]"
-# ADD CPP /nologo /W3 /FD /Fd"[rootpath]\[configs.name]\[target.output_dir]\[target.output_pdb]" /c [is configs.name "Debug"]/MDd /Gm /Gi /GX /ZI /Od /GZ[else]/MD /GX /O2 /Zi[end][for configs.defines] /D "[configs.defines]"[end][if-any instrument_apr_pools] /D "APR_POOL_DEBUG=[instrument_apr_pools]"[end][for includes] /I "[includes]"[end]
-# ADD RSC /l [if-any is_exe]0x409[else]0x424[end][is configs.name "Debug"] /d "_DEBUG"[end][for includes] /I "[includes]"[end]
-BSC32=bscmake.exe
-LINK32=link.exe
-[if-any is_exe is_dll]# ADD LINK32 /nologo[if-any is_exe] /subsystem:console[end][if-any is_dll] /dll[end] /debug /machine:IX86[for configs.libs] [configs.libs][end][for configs.libdirs] /libpath:"[configs.libdirs]"[end] /out:"[rootpath]\[configs.name]\[target.output_dir]\[target.output_name]"[if-any instrument_purify_quantify] /fixed:no[end]
-[end][end][end][end][end]
-!ENDIF
-
-# Begin Target
-
-[for platforms][for configs]# Name "[target.proj_name] - [platforms] [configs.name]"
-[end][end][is target_number "0x0102"]# Begin Source File
-
-SOURCE="..\empty.c"
-# End Source File
-[end][for sources]# Begin Source File
-
-SOURCE=[sources.path][if-any sources.reldir]
-[for platforms][for configs]
-![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
-
-# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.intermediate_dir]\[sources.reldir]"
-[end][end]
-!ENDIF
-[end][for sources.user_deps][if-index sources.user_deps first]
-USERDEP__=[else] [end]"[sources.user_deps]"[end][if-any sources.custom_build]
-[for platforms][for configs]
-![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
-
-# Begin Custom Build
-
-InputPath=[sources.path]
-
-[sources.custom_target] : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-[if-any sources.custom_build] [sources.custom_build]
-[end]
-# End Custom Build
-[end][end]
-!ENDIF
-[end]
-# End Source File
-[end]
-[if-any target.desc]
-# Begin Source File
-
-SOURCE="[rootpath]\build\win32\svn.rc"
-# ADD RSC /d SVN_FILE_NAME="[target.output_name]" /d SVN_FILE_DESCRIPTION="[target.desc]"
-# End Source File
-[end]
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="[target.proj_name]" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "[target_type]" [target_number]
+
+CFG=[target.proj_name] - [default_platform] [default_config]
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "[target.proj_name]_msvc.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "[target.proj_name]_msvc.mak" CFG="[target.proj_name] - [default_platform] [default_config]"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+[for platforms][for configs]!MESSAGE "[target.proj_name] - [platforms] [configs.name]" (based on "[target_type]")
+[end][end]!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+[for platforms][for configs]
+![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
+
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries [is configs.name "Debug"]1[else]0[end]
+[if-any is_external]# PROP Output_Dir "[rootpath]\[target.output_dir]\[configs.name]"
+# PROP Intermediate_Dir "[rootpath]\[target.intermediate_dir]\[configs.name]"
+# PROP Cmd_Line "cmd /c [target.cmd] [configs.lower]"
+# PROP Rebuild_Opt "rebuild"
+# PROP Target_File "[rootpath]\[target.output_dir]\[is configs.name "Debug"][target.debug][else][target.release][end]"
+# PROP Target_Dir "[rootpath]\[target.output_dir]"
+[else]# PROP Output_Dir "[rootpath]\[configs.name]\[target.output_dir]"
+# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.intermediate_dir]"
+# PROP Target_Dir ""
+[if-any is_utility][else]LIB32=link.exe -lib
+# ADD LIB32 /out:"[rootpath]\[configs.name]\[target.output_dir]\[target.output_name]"
+# ADD CPP /nologo /W3 /FD /Fd"[rootpath]\[configs.name]\[target.output_dir]\[target.output_pdb]" /c [is configs.name "Debug"]/MDd /Gm /Gi /GX /ZI /Od /GZ[else]/MD /GX /O2 /Zi[end][for configs.defines] /D "[configs.defines]"[end][if-any instrument_apr_pools] /D "APR_POOL_DEBUG=[instrument_apr_pools]"[end][for includes] /I "[includes]"[end]
+# ADD RSC /l [if-any is_exe]0x409[else]0x424[end][is configs.name "Debug"] /d "_DEBUG"[end][for includes] /I "[includes]"[end]
+BSC32=bscmake.exe
+LINK32=link.exe
+[if-any is_exe is_dll]# ADD LINK32 /nologo[if-any is_exe] /subsystem:console[end][if-any is_dll] /dll[end] /debug /machine:IX86[for configs.libs] [configs.libs][end][for configs.libdirs] /libpath:"[configs.libdirs]"[end] /out:"[rootpath]\[configs.name]\[target.output_dir]\[target.output_name]"[if-any instrument_purify_quantify] /fixed:no[end]
+[end][end][end][end][end]
+!ENDIF
+
+# Begin Target
+
+[for platforms][for configs]# Name "[target.proj_name] - [platforms] [configs.name]"
+[end][end][is target_number "0x0102"]# Begin Source File
+
+SOURCE="..\empty.c"
+# End Source File
+[end][for sources]# Begin Source File
+
+SOURCE=[sources.path][if-any sources.reldir]
+[for platforms][for configs]
+![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
+
+# PROP Intermediate_Dir "[rootpath]\[configs.name]\[target.intermediate_dir]\[sources.reldir]"
+[end][end]
+!ENDIF
+[end][for sources.user_deps][if-index sources.user_deps first]
+USERDEP__=[else] [end]"[sources.user_deps]"[end][if-any sources.custom_build]
+[for platforms][for configs]
+![if-index platforms first][if-index configs first][else]ELSE[end][else]ELSE[end]IF "$(CFG)" == "[target.proj_name] - [platforms] [configs.name]"
+
+# Begin Custom Build
+
+InputPath=[sources.path]
+
+[sources.custom_target] : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+[if-any sources.custom_build] [sources.custom_build]
+[end]
+# End Custom Build
+[end][end]
+!ENDIF
+[end]
+# End Source File
+[end]
+[if-any target.desc]
+# Begin Source File
+
+SOURCE="[rootpath]\build\win32\svn.rc"
+# ADD RSC /d SVN_FILE_NAME="[target.output_name]" /d SVN_FILE_DESCRIPTION="[target.desc]"
+# End Source File
+[end]
+# End Target
+# End Project
Propchange: subversion/branches/ignore-mergeinfo/build/generator/msvc_dsp.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native
Modified: subversion/branches/ignore-mergeinfo/build/generator/msvc_dsw.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/msvc_dsw.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/msvc_dsw.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/msvc_dsw.ezt Tue Aug 10 18:06:17 2010
@@ -1,32 +1,32 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-[for targets]Project: "[targets.name]"=[targets.dsp] - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-[for targets.depends] Begin Project Dependency
- Project_Dep_Name [targets.depends]
- End Project Dependency
-[end]}}}
-
-###############################################################################
-
-[end]Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+[for targets]Project: "[targets.name]"=[targets.dsp] - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+[for targets.depends] Begin Project Dependency
+ Project_Dep_Name [targets.depends]
+ End Project Dependency
+[end]}}}
+
+###############################################################################
+
+[end]Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Propchange: subversion/branches/ignore-mergeinfo/build/generator/msvc_dsw.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native
Modified: subversion/branches/ignore-mergeinfo/build/generator/neon.dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/neon.dsp.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/neon.dsp.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/neon.dsp.ezt Tue Aug 10 18:06:17 2010
@@ -1,96 +1,96 @@
-# Microsoft Developer Studio Project File - Name="neon" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=neon - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "neon.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "neon.mak" CFG="neon - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "neon - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "neon - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "neon - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_File "libneon.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "nmake /nologo /f neon.mak ALL EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "libneon.lib"
-# PROP Bsc_Name ""
-
-!ELSEIF "$(CFG)" == "neon - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Rebuild_Opt "rebuild"
-# PROP BASE Target_File "libneonD.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "nmake /nologo /f neon.mak ALL DEBUG_BUILD=Aye EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "libneonD.lib"
-# PROP Bsc_Name ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "neon - Win32 Release"
-# Name "neon - Win32 Debug"
-
-!IF "$(CFG)" == "neon - Win32 Release"
-
-!ELSEIF "$(CFG)" == "neon - Win32 Debug"
-
-!ENDIF
-
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-[for neon_sources]# Begin Source File
-
-SOURCE="[neon_sources]"
-# End Source File
-[end]
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-[for neon_headers]# Begin Source File
-
-SOURCE="[neon_headers]"
-# End Source File
-[end]
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="neon" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=neon - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "neon.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "neon.mak" CFG="neon - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "neon - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "neon - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "neon - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_File "libneon.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "nmake /nologo /f neon.mak ALL EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "libneon.lib"
+# PROP Bsc_Name ""
+
+!ELSEIF "$(CFG)" == "neon - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Rebuild_Opt "rebuild"
+# PROP BASE Target_File "libneonD.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "nmake /nologo /f neon.mak ALL DEBUG_BUILD=Aye EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "libneonD.lib"
+# PROP Bsc_Name ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "neon - Win32 Release"
+# Name "neon - Win32 Debug"
+
+!IF "$(CFG)" == "neon - Win32 Release"
+
+!ELSEIF "$(CFG)" == "neon - Win32 Debug"
+
+!ENDIF
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+[for neon_sources]# Begin Source File
+
+SOURCE="[neon_sources]"
+# End Source File
+[end]
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+[for neon_headers]# Begin Source File
+
+SOURCE="[neon_headers]"
+# End Source File
+[end]
+# End Group
+# End Target
+# End Project
Propchange: subversion/branches/ignore-mergeinfo/build/generator/neon.dsp.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native
Modified: subversion/branches/ignore-mergeinfo/build/generator/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/neon.vcxproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/neon.vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/neon.vcxproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,64 +1,63 @@
-[define COPYRIGHT]
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-[end]<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
-[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
- <Configuration>[configs]</Configuration>
- <Platform>[platforms]</Platform>
- </ProjectConfiguration>
-[end][end] </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>neon</ProjectName>
- <ProjectGuid>[project_guid]</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <CLRSupport>false</CLRSupport>
- </PropertyGroup>
-[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
- </ImportGroup>
-[end][end] <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
-[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /nologo /f neon.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
- <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[is configs "Release"]libneon.lib[else]libneonD.lib[end]</NMakeOutput>
-[end][end] </PropertyGroup>
- <ItemDefinitionGroup>
- </ItemDefinitionGroup>
- <ItemGroup>
-[for neon_sources] <ClCompile Include="[neon_sources]" />
-[end] </ItemGroup>
- <ItemGroup>
-[for neon_headers] <ClInclude Include="[neon_headers]" />
-[end] </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
+[#
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+]<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
+ <Configuration>[configs]</Configuration>
+ <Platform>[platforms]</Platform>
+ </ProjectConfiguration>
+[end][end] </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>[project_guid]</ProjectGuid>
+ <Keyword>MakeFileProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ </PropertyGroup>
+[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
+[end][end] <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /nologo /f neon.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstat[is configs "Debug"]D[end].lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[is configs "Release"]libneon.lib[else]libneonD.lib[end]</NMakeOutput>
+[end][end] </PropertyGroup>
+ <ItemDefinitionGroup>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+[for neon_sources] <ClCompile Include="[neon_sources]" />
+[end] </ItemGroup>
+ <ItemGroup>
+[for neon_headers] <ClInclude Include="[neon_headers]" />
+[end] </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>