subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1427105 - in /subversion/branches/1.6.x-serf-1-win32: ./ build/generator/ build/generator/gen_win.py build/generator/serf.dsp.ezt build/generator/serf.vcproj.ezt
Date Mon, 31 Dec 2012 12:28:16 GMT
Author: rhuijben
Date: Mon Dec 31 12:28:16 2012
New Revision: 1427105

URL: http://svn.apache.org/viewvc?rev=1427105&view=rev
Log:
Merge r1140588, accounting for moving templates

Modified:
    subversion/branches/1.6.x-serf-1-win32/   (props changed)
    subversion/branches/1.6.x-serf-1-win32/build/generator/   (props changed)
    subversion/branches/1.6.x-serf-1-win32/build/generator/gen_win.py
    subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt
    subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt

Propchange: subversion/branches/1.6.x-serf-1-win32/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1140588

Propchange: subversion/branches/1.6.x-serf-1-win32/build/generator/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 31 12:28:16 2012
@@ -0,0 +1,136 @@
+/subversion/branches/1.5.x-r30215/build/generator:870312
+/subversion/branches/1.6.x-1.6.8-serfassertion/build/generator:900822-900868
+/subversion/branches/1.6.x-3242-partial-fixes/build/generator:931279-932637
+/subversion/branches/1.6.x-UNC-paths/build/generator:876471-876545
+/subversion/branches/1.6.x-dirent-basename/build/generator:876130-876262
+/subversion/branches/1.6.x-fsfs-begin-txn-deadlock/build/generator:1063950-1104090
+/subversion/branches/1.6.x-future-proof/build/generator:880259-884209
+/subversion/branches/1.6.x-issue-3242-partial/build/generator:916088-923778
+/subversion/branches/1.6.x-issue3242-reintegrate/build/generator:954549-1001798
+/subversion/branches/1.6.x-issue3303/build/generator:950948-955336
+/subversion/branches/1.6.x-issue3390/build/generator:907042-927863
+/subversion/branches/1.6.x-issue3432/build/generator:878598-924025
+/subversion/branches/1.6.x-issue3443/build/generator:878597-879480
+/subversion/branches/1.6.x-issue3469/build/generator:945700-953293
+/subversion/branches/1.6.x-issue3506/build/generator:934622-955678
+/subversion/branches/1.6.x-issue3506-init_once/build/generator:935083-955686
+/subversion/branches/1.6.x-issue3519/build/generator:880376-889934
+/subversion/branches/1.6.x-issue3573/build/generator:906488-923765
+/subversion/branches/1.6.x-issue3605/build/generator:923668-923887
+/subversion/branches/1.6.x-issue3623/build/generator:952794-956049
+/subversion/branches/1.6.x-issue3641/build/generator:1072041-1125381
+/subversion/branches/1.6.x-issue3646/build/generator:957327-1002699
+/subversion/branches/1.6.x-issue3648/build/generator:964172-1001805
+/subversion/branches/1.6.x-issue3650/build/generator:1095508-1125384
+/subversion/branches/1.6.x-issue3651/build/generator:952977-954985
+/subversion/branches/1.6.x-issue3654/build/generator:953882-955338
+/subversion/branches/1.6.x-issue3683/build/generator:965785-988062
+/subversion/branches/1.6.x-issue3700/build/generator:991967-997279
+/subversion/branches/1.6.x-issue3719/build/generator:1075930-1096984
+/subversion/branches/1.6.x-issue3727/build/generator:1032967-1033213
+/subversion/branches/1.6.x-issue3745/build/generator:1032257-1033223
+/subversion/branches/1.6.x-issue3816/build/generator:1083880-1104106
+/subversion/branches/1.6.x-issue3843/build/generator:1084999-1104104
+/subversion/branches/1.6.x-issue3845/build/generator:1086922-1104099
+/subversion/branches/1.6.x-issue3853/build/generator:1091877-1103782
+/subversion/branches/1.6.x-issue3957/build/generator:1146871-1174075
+/subversion/branches/1.6.x-issue4129/build/generator:1302627-1303068
+/subversion/branches/1.6.x-neon-expat/build/generator:1127177-1127947
+/subversion/branches/1.6.x-no-svn_uri/build/generator:876360-876415
+/subversion/branches/1.6.x-no-wcng-check/build/generator:1022248-1035322
+/subversion/branches/1.6.x-r1002094/build/generator:1002741-1002773
+/subversion/branches/1.6.x-r1024269/build/generator:1024274-1035798
+/subversion/branches/1.6.x-r1051744/build/generator:1052424-1071327
+/subversion/branches/1.6.x-r1053984/build/generator:1072277-1104342
+/subversion/branches/1.6.x-r1058269/build/generator:1058271-1072344
+/subversion/branches/1.6.x-r1068988/build/generator:1070588-1072337
+/subversion/branches/1.6.x-r1072084/build/generator:1072274-1100234
+/subversion/branches/1.6.x-r1104309/build/generator:1104318-1124170
+/subversion/branches/1.6.x-r1134734/build/generator:1138976-1151459
+/subversion/branches/1.6.x-r1152282/build/generator:1152814-1300864
+/subversion/branches/1.6.x-r1230212/build/generator:1241382-1302885
+/subversion/branches/1.6.x-r1306111/build/generator:1331052-1380968
+/subversion/branches/1.6.x-r1330410/build/generator:1330546-1382814
+/subversion/branches/1.6.x-r1387226/build/generator:1399995-1424797
+/subversion/branches/1.6.x-r36178/build/generator:877876-877884
+/subversion/branches/1.6.x-r36252/build/generator:876328-876788
+/subversion/branches/1.6.x-r37622/build/generator:877699-877993
+/subversion/branches/1.6.x-r37627/build/generator:877704-877928
+/subversion/branches/1.6.x-r37857/build/generator:877932-877936
+/subversion/branches/1.6.x-r37953/build/generator:879809-880071
+/subversion/branches/1.6.x-r37988/build/generator:878063-878897
+/subversion/branches/1.6.x-r38000/build/generator:879083-879767
+/subversion/branches/1.6.x-r38222/build/generator:878299-878891
+/subversion/branches/1.6.x-r38572/build/generator:878661-878666
+/subversion/branches/1.6.x-r38799/build/generator:878880-878917
+/subversion/branches/1.6.x-r38836/build/generator:878911-952818
+/subversion/branches/1.6.x-r38927/build/generator:879002-879176
+/subversion/branches/1.6.x-r39019/build/generator:879132-895676
+/subversion/branches/1.6.x-r39109/build/generator:879131
+/subversion/branches/1.6.x-r39557/build/generator:879668-879907
+/subversion/branches/1.6.x-r39887/build/generator:880024-880066
+/subversion/branches/1.6.x-r40452/build/generator:880530-890996
+/subversion/branches/1.6.x-r877814/build/generator:1003097-1033216
+/subversion/branches/1.6.x-r878590/build/generator:1104266-1104381
+/subversion/branches/1.6.x-r879757/build/generator:987687-999407
+/subversion/branches/1.6.x-r880146/build/generator:1071612-1072350
+/subversion/branches/1.6.x-r889840/build/generator:889888-890974
+/subversion/branches/1.6.x-r891672/build/generator:891676-923748
+/subversion/branches/1.6.x-r892050/build/generator:923839-923856
+/subversion/branches/1.6.x-r896522/build/generator:896528-897866
+/subversion/branches/1.6.x-r896893/build/generator:1152802-1302890
+/subversion/branches/1.6.x-r898963/build/generator:899874-915098
+/subversion/branches/1.6.x-r905326/build/generator:905545-923537
+/subversion/branches/1.6.x-r907644/build/generator:1033292-1033692
+/subversion/branches/1.6.x-r917523/build/generator:1035989-1104126
+/subversion/branches/1.6.x-r923389/build/generator:927445-929628
+/subversion/branches/1.6.x-r926151/build/generator:927922-929631
+/subversion/branches/1.6.x-r933299/build/generator:933310-934492
+/subversion/branches/1.6.x-r935631/build/generator:952683-955333
+/subversion/branches/1.6.x-r935996/build/generator:936212-952816
+/subversion/branches/1.6.x-r966167/build/generator:1127963-1300867
+/subversion/branches/1.6.x-r979045/build/generator:987702-997248
+/subversion/branches/1.6.x-r980811/build/generator:980813-987709
+/subversion/branches/1.6.x-r981921/build/generator:981922-997253
+/subversion/branches/1.6.x-r991534/build/generator:1003116-1033219
+/subversion/branches/1.6.x-r997457/build/generator:997808-1002642
+/subversion/branches/1.6.x-rep_write_cleanup/build/generator:1404733-1411981
+/subversion/branches/1.6.x-svn_fs_commit_txn/build/generator:1053419-1104095
+/subversion/branches/1.6.x-testsuite-apr-hash-order/build/generator:1383328-1383942
+/subversion/branches/1.6.x-wc-ng-check-override/build/generator:910213-923776
+/subversion/branches/1.6.x-wc-ng-error/build/generator:929379-929636
+/subversion/branches/1.7.x-r1306111/build/generator:1306302-1331000
+/subversion/branches/bdb-reverse-deltas/build/generator:872050-872529
+/subversion/branches/diff-callbacks3/build/generator:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/build/generator:870728-871118
+/subversion/branches/double-delete/build/generator:870511-872970
+/subversion/branches/file-externals/build/generator:871779-873302
+/subversion/branches/fs-rep-sharing/build/generator:869036-873803
+/subversion/branches/fsfs-pack/build/generator:873717-874575
+/subversion/branches/gnome-keyring/build/generator:870558-871410
+/subversion/branches/http-protocol-v2/build/generator:875632
+/subversion/branches/in-memory-cache/build/generator:869829-871452
+/subversion/branches/issue-2843-dev/build/generator:871432-874179
+/subversion/branches/issue-3000/build/generator:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/build/generator:873375-874084
+/subversion/branches/issue-3148-dev/build/generator:875193-875204
+/subversion/branches/issue-3220-dev/build/generator:872210-872226
+/subversion/branches/issue-3242-dev/build/generator:879762,880472,880579
+/subversion/branches/issue-3334-dirs/build/generator:875156-875867
+/subversion/branches/kwallet/build/generator:870785-871314
+/subversion/branches/log-g-performance/build/generator:870941-871032
+/subversion/branches/merge-skips-obstructions/build/generator:874525-874615
+/subversion/branches/performance/build/generator:982355,983766,984927
+/subversion/branches/reintegrate-improvements/build/generator:873853-874164
+/subversion/branches/subtree-mergeinfo/build/generator:876855
+/subversion/branches/svn-mergeinfo-enhancements/build/generator:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff/build/generator:871905,871986
+/subversion/branches/svnserve-logging/build/generator:869828-870893
+/subversion/branches/tc-issue-3334/build/generator:874697-874773
+/subversion/branches/tc-merge-notify/build/generator:874017-874062
+/subversion/branches/tc-resolve/build/generator:874191-874239
+/subversion/branches/tc_url_rev/build/generator:874351-874483
+/subversion/branches/tree-conflicts/build/generator:868291-873154
+/subversion/branches/tree-conflicts-notify/build/generator:873926-874008
+/subversion/trunk/build/generator:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877
 442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-87919
 9,879201,879271,879293,879357,879359-879360,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880027,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,893478,895514,895653,896522,896893,896901,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953308,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,966167,979045,979429,980811,981449,981921,984565,984928,984931,991534,
 992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036429,1036534,1036978,1037762,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063572-1063573,1063592,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1074572,1076730,1076759,1076826,1078954,1081255,1084575,1084581,1084764,1084962,1084978,1086222,1088602,1094692,1095654,1098608,1102803,1103665,1104309,1125983,1125998,1126007,1126810,1130303,1130448,1134734,1140208,1140588,1144316,1146870,1151036,1151911,1152282,1154733,1166555,1166678,1178280,1178282,1186121,1186231,1205726,1230212,1235264,1235296,1235302,1235736,1240619,12407
 52,1241626,1291429,1291446,1291520,1291680,1291704,1291726,1291941,1292248,1292255,1292260,1292296,1292322,1292507,1292516,1292768,1292926,1294470,1302399,1302539,1302591,1302613,1306111,1310535,1310594,1330410,1338810,1339164,1387226,1390653,1402417,1403964,1403982,1410106,1410203,1426264
+/subversion/trunk/build/generator/templates:1140588

Modified: subversion/branches/1.6.x-serf-1-win32/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-serf-1-win32/build/generator/gen_win.py?rev=1427105&r1=1427104&r2=1427105&view=diff
==============================================================================
--- subversion/branches/1.6.x-serf-1-win32/build/generator/gen_win.py (original)
+++ subversion/branches/1.6.x-serf-1-win32/build/generator/gen_win.py Mon Dec 31 12:28:16
2012
@@ -1085,6 +1085,11 @@ class WinGeneratorBase(GeneratorBase):
       return
 
     serf_path = os.path.abspath(self.serf_path)
+    if self.serf_ver_maj == 1:
+      serflib = 'serf-1.lib'
+    else:
+      serflib = 'serf.lib'
+
     self.move_proj_file(self.serf_path, name,
                         (('serf_sources',
                           glob.glob(os.path.join(serf_path, '*.c'))
@@ -1103,6 +1108,7 @@ class WinGeneratorBase(GeneratorBase):
                             and os.path.abspath(self.openssl_path)),
                          ('apr_path', os.path.abspath(self.apr_path)),
                          ('apr_util_path', os.path.abspath(self.apr_util_path)),
+                         ('serf_lib', serflib),
                         ))
 
   def move_proj_file(self, path, name, params=()):

Modified: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt?rev=1427105&r1=1427104&r2=1427105&view=diff
==============================================================================
--- subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt (original)
+++ subversion/branches/1.6.x-serf-1-win32/build/generator/serf.dsp.ezt Mon Dec 31 12:28:16
2012
@@ -32,7 +32,7 @@ CFG=serf - Win32 Debug
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "Release"
 # PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_File "Release/serf.lib"
+# PROP BASE Target_File "Release/[serf_lib]"
 # PROP BASE Bsc_Name ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -40,7 +40,7 @@ CFG=serf - Win32 Debug
 # PROP Intermediate_Dir "Release"
 # PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_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 "Release/serf.lib"
+# PROP Target_File "Release/[serf_lib]"
 # PROP Bsc_Name ""
 
 !ELSEIF  "$(CFG)" == "serf - Win32 Debug"
@@ -50,7 +50,7 @@ CFG=serf - Win32 Debug
 # PROP BASE Output_Dir "Debug"
 # PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug/serf.lib"
+# PROP BASE Target_File "Debug/[serf_lib]"
 # PROP BASE Bsc_Name ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -58,7 +58,7 @@ CFG=serf - Win32 Debug
 # PROP Intermediate_Dir "Debug"
 # PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path]
APRUTIL_SRC=[apr_util_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 "Debug/serf.lib"
+# PROP Target_File "Debug/[serf_lib]"
 # PROP Bsc_Name ""
 
 !ENDIF 

Modified: subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt?rev=1427105&r1=1427104&r2=1427105&view=diff
==============================================================================
--- subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt (original)
+++ subversion/branches/1.6.x-serf-1-win32/build/generator/serf.vcproj.ezt Mon Dec 31 12:28:16
2012
@@ -22,7 +22,7 @@
                 BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path]
APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
                 ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1
APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end]
[if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
                 CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path]
APRUTIL_SRC=[apr_util_path]  [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                Output="$(OutDir)\serf.lib"/>
+                Output="$(OutDir)\[serf_lib]"/>
         </Configuration>
         <Configuration
             Name="Release|[platforms]"
@@ -36,7 +36,7 @@
                 BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path]
[if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
                 ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path]
APRUTIL_SRC=[apr_util_path]  [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
                 CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path]
[if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                Output="$(OutDir)\serf.lib"/>
+                Output="$(OutDir)\[serf_lib]"/>
         </Configuration>
 [end]    </Configurations>
     <Files>



Mime
View raw message