Check-in [4df99df5ae]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bugfixes in publication batch script.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | src-1.3.2.0
Files: files | file ages | folders
SHA1: 4df99df5ae69894d27b88d64fbb731904d0cdb34
User & Date: tinus 2019-03-16 09:54:46
Context
2019-03-16
11:02
Copy files from 32-bits to 64-bits version in publish script. check-in: 9610d68156 user: tinus tags: trunk, src-1.3.2.0, release-src
09:54
Bugfixes in publication batch script. check-in: 4df99df5ae user: tinus tags: trunk, src-1.3.2.0
09:40
Merge and integrate win64 to trunk. check-in: 01f90f575c user: tinus tags: trunk
Changes

Changes to publish.cmd.

     1      1   <!-- :: Begin batch script
     2      2   @Echo off
     3      3   
     4      4   :: set code page to UTF-8
     5         -chcp 65001
            5  +chcp 65001 >NUL
     6      6   
     7         -pushd %~dp0
            7  +pushd "%~dp0"
     8      8   
     9      9   :: call the WSF script to extract the current version number from the .dproj file
    10         -CScript //nologo "%f0?.wsf" > set_version.cmd
    11         -call set_version.cmd
    12         -del set_version.cmd
           10  +CScript //nologo "%~f0?.wsf" > set_version.bat
           11  +call set_version.bat
           12  +del set_version.bat
    13     13   
    14         -echo Preparing to build and release of version "%RELEASE_VERSION%".
           14  +echo Preparing to build and release of version "%RELEASE_VERSION%" from branch:
           15  +fossil tag list current
    15     16   echo Press Ctrl-C to abort publication;
    16     17   pause
    17     18   
    18     19   :: prepare to build the DLLs
    19     20   call rsvars.bat
    20     21   
    21     22   MSBuild /v:q /p:Config=Release;Platform=Win32 /t:build src\prj\PreviewHTML.dproj > out\PreviewHTML_Win32.txt
................................................................................
    24     25   MSBuild /v:q /p:Config=Release;Platform=Win64 /t:build src\prj\PreviewHTML.dproj > out\PreviewHTML_Win64.txt
    25     26   if errorlevel 1 echo Compilation errors, aborting... && start "" out\PreviewHTML_Win64.txt && goto TheEnd
    26     27   
    27     28   fossil commit --tag src-%RELEASE_VERSION% --allow-empty
    28     29   
    29     30   pushd %~dp0\out\Win32\Release
    30     31   if not exist _FOSSIL_ echo goto NoPublicationRepo
    31         -move PreviewHTML.dll PreviewHTML32.dll
    32     32   start /wait "Release notes" ReleaseNotes.txt
    33     33   fossil commit --tag v%RELEASE_VERSION%-32 --tag v%RELEASE_VERSION%
    34     34   popd
    35     35   
    36     36   pushd %~dp0\out\Win64\Release
    37     37   if not exist _FOSSIL_ goto NoPublicationRepo
    38         -move PreviewHTML.dll PreviewHTML64.dll
    39     38   start /wait "Release notes" ReleaseNotes.txt
    40     39   fossil commit --tag v%RELEASE_VERSION%-64 --tag v%RELEASE_VERSION%
    41     40   popd
    42     41   
    43     42   goto TheEnd
    44     43   
    45     44   :NoPublicationRepo
................................................................................
    51     50   exit /b
    52     51   
    53     52   
    54     53   -- begin of wsf script -->
    55     54   <package>
    56     55   	<job>
    57     56   		<script language="JScript">
    58         -			var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6");
    59         -			xmlDoc.Load("src\\prj\\PreviewHTML.dproj");
    60         -			xmlDoc.SetSelectionNamespaces('xmlns:b="http://schemas.microsoft.com/developer/msbuild/2003"');
    61         -			var xmlKeys = xmlDoc.SelectSingleNode("/b:Project/b:PropertyGroup/b:VerInfo_Keys");
           57  +			var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6.0");
           58  +			xmlDoc.load("src\\prj\\PreviewHTML.dproj");
           59  +			xmlDoc.setProperty("SelectionNamespaces", "xmlns:b='http://schemas.microsoft.com/developer/msbuild/2003'");
           60  +			var xmlKeys = xmlDoc.selectSingleNode("/b:Project/b:PropertyGroup/b:VerInfo_Keys");
    62     61   			if (xmlKeys) {
    63     62   				var keys = xmlKeys.text;
    64         -				var match = /FileVersion=((\d+\.)+\d+)/.match(keys);
           63  +				var match = keys.match(/FileVersion=((\d+\.)+\d+)/);
    65     64   				if (match) {
    66     65   					WScript.Echo("set RELEASE_VERSION=" + match[1]);
    67     66   				}
    68     67   			}
    69     68   		</script>
    70     69   	</job>
    71     70   </package>