subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1327812 - in /subversion/branches/1.7.x: ./ STATUS build/win32/make_dist.py build/win32/vc6-build.bat.in
Date Thu, 19 Apr 2012 04:01:36 GMT
Author: svn-role
Date: Thu Apr 19 04:01:35 2012
New Revision: 1327812

URL: http://svn.apache.org/viewvc?rev=1327812&view=rev
Log:
Merge r1295007 from trunk:

 * r1295007
   Include svnrdump in the Windows build.
   Justification:
     I do not know for sure, but I assume that either make-dist.py or
     vc6-build.bat.in is actually used by some people --- and if I'm wrong,
     this would be harmless.
   Votes:
     +1: danielsh, hwright, rhuijben

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/build/win32/make_dist.py
    subversion/branches/1.7.x/build/win32/vc6-build.bat.in

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1295007

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1327812&r1=1327811&r2=1327812&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Apr 19 04:01:35 2012
@@ -142,12 +142,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1295007
-   Include svnrdump in the Windows build.
-   Justification:
-     I do not know for sure, but I assume that either make-dist.py or
-     vc6-build.bat.in is actually used by some people --- and if I'm wrong,
-     this would be harmless.
-   Votes:
-     +1: danielsh, hwright, rhuijben

Modified: subversion/branches/1.7.x/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/win32/make_dist.py?rev=1327812&r1=1327811&r2=1327812&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/win32/make_dist.py (original)
+++ subversion/branches/1.7.x/build/win32/make_dist.py Thu Apr 19 04:01:35 2012
@@ -209,6 +209,8 @@ _disttree = {'': OptFile('%(readme)s', '
                      File('%(blddir)s/svnserve/svnserve.pdb'),
                      File('%(blddir)s/svnversion/svnversion.exe'),
                      File('%(blddir)s/svnversion/svnversion.pdb'),
+                     File('%(blddir)s/svnrdump/svnrdump.exe'),
+                     File('%(blddir)s/svnrdump/svnrdump.pdb'),
                      File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
                      File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
                      File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),

Modified: subversion/branches/1.7.x/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/win32/vc6-build.bat.in?rev=1327812&r1=1327811&r2=1327812&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/1.7.x/build/win32/vc6-build.bat.in Thu Apr 19 04:01:35 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
 copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
 copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
 copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"



Mime
View raw message