Databasic dependencies incrementation, VS2017 implementation, result directory name changed, dll, xml amd pdb results copying into result directory

Author: tomFlidr

BaseBuild.js

@@ -90,8 +90,8 @@ Class.Define('BaseBuild', {
 		var dirFullPath = '';
 		for (var i = 0, l = this.modulesInfo.length; i < l; i += 1) {
 			dirFullPath = this.modulesInfo[i].dirFullPath;
-			this.cleanDirectory(dirFullPath + '/bin/Debug');
-			this.cleanDirectory(dirFullPath + '/bin/Release');
+			this.cleanDirectory(dirFullPath + '/bin/Debug', ['nupkg']);
+			this.cleanDirectory(dirFullPath + '/bin/Release', ['nupkg']);
 		}
 	},
 	setUpVersionToAssemblyInfos: function () {
@@ -149,14 +149,15 @@ Class.Define('BaseBuild', {
 			readStream = Wsh.Fso.OpenTextFile(nugetCfgFullPath, 1, false);
 			nugetCfgContent = readStream.ReadAll();
 			readStream.Close();
-			nugetCfgContent = this._setUpVersionToNugspecCfgContent(nugetCfgContent);
+			nugetCfgContent = this._setUpVersionToNugspecCfgContentVersionNode(nugetCfgContent);
+			nugetCfgContent = this._setUpVersionToNugspecCfgContentDependencyNode(nugetCfgContent);
 			// for overwriting, not as Unicode
 			writeStream = Wsh.Fso.CreateTextFile(nugetCfgFullPath, true, false);
 			writeStream.Write(nugetCfgContent);
 			writeStream.Close();
 		}
 	},
-	_setUpVersionToNugspecCfgContent: function (nugetCfgContent) {
+	_setUpVersionToNugspecCfgContentVersionNode: function (nugetCfgContent) {
 		var index = 0,
 			openingNode = '<version>',
 			closingNode = '</version>',
@@ -182,6 +183,35 @@ Class.Define('BaseBuild', {
 		}
 		return nugetCfgContent;
 	},
+	_setUpVersionToNugspecCfgContentDependencyNode: function (nugetCfgContent) {
+		var index = 0,
+			openingNode = '<dependency id="Databasic',
+			closingNode = '/>',
+			valueBegin = 0,
+			valueEnd = 0,
+			versionStr = '',
+			versionsJoined = this.versions.join('.');
+		while (true) {
+			valueBegin = nugetCfgContent.indexOf(openingNode, index);
+			if (valueBegin == -1) break;
+			valueBegin += openingNode.length;
+			valueEnd = nugetCfgContent.indexOf(closingNode, valueBegin);
+			if (valueEnd == -1) break;
+			versionStr = nugetCfgContent.substring(valueBegin, valueEnd);
+			if (!/version="([0-9\.]*)"/gi.test(versionStr)) {
+				index = valueEnd;
+				continue;
+			}
+			versionStr = versionStr.replace(/version="([0-9\.]*)"/gi, function (m) {
+				return 'version="'+ versionsJoined + '"';
+			});
+			nugetCfgContent = nugetCfgContent.substr(0, valueBegin)
+				+ versionStr
+				+ nugetCfgContent.substr(valueEnd);
+			index = valueBegin + versionStr.length;
+		}
+		return nugetCfgContent;
+	},
 	setUpVersionToReadmes: function () {
 		var readStream = null,
 			writeStream = null,
@@ -210,15 +240,15 @@ Class.Define('BaseBuild', {
 		//log(nugetCfgContent);
 		return nugetCfgContent;
 	},
-	cleanDirectory: function (relativeOrAbsolutePath, allFiles) {
+	cleanDirectory: function (relativeOrAbsolutePath, extensions) {
 		var folder = Wsh.Fso.GetFolder(relativeOrAbsolutePath),
 			filesEnum = new Enumerator(folder.files),
-			allFiles = !!allFiles,
+			allFiles = extensions == '*',
 			fileExt = '';
 		for (; !filesEnum.atEnd() ; filesEnum.moveNext()) {
 			file = Wsh.Fso.GetFile(String(filesEnum.item()));
 			fileExt = String(Wsh.Fso.GetExtensionName(file.Path)).toLowerCase();
-			if (allFiles || (!allFiles && fileExt == 'nupkg')) {
+			if (allFiles || (!allFiles && extensions.indexOf(fileExt) > -1)) {
 				try {
 					Wsh.Fso.DeleteFile(file.Path);
 				} catch (e) { }

Databasic.BuildCommands.jsproj

@@ -0,0 +1,57 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <Name>Databasic.BuildCommands</Name>
+    <RootNamespace>Databasic.BuildCommands</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>30027b0b-a90f-4997-b00b-f40ae88382a5</ProjectGuid>
+    <ProjectHome>.</ProjectHome>
+    <StartupFile>
+    </StartupFile>
+    <StartWebBrowser>False</StartWebBrowser>
+    <SearchPath>
+    </SearchPath>
+    <WorkingDirectory>.</WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>
+    <StartWebBrowser>false</StartWebBrowser>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="WSH\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseBuild.js" />
+    <Compile Include="WSH\Class.js" />
+    <Compile Include="WSH\Json2.js" />
+    <Compile Include="WSH\Log.js" />
+    <Compile Include="WSH\Shell.js" />
+    <Compile Include="WSH\String.js" />
+    <Compile Include="WSH\Wsh.js" />
+    <Compile Include="_references.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include=".gitignore" />
+    <Content Include="GLOBAL_VERSION_NUMBER" />
+    <Content Include="LICENSE" />
+    <Content Include="PostBuild.bat" />
+    <Content Include="PostBuild.wsf" />
+    <Content Include="PreBuild.bat" />
+    <Content Include="PreBuild.wsf" />
+    <Content Include="README.md" />
+  </ItemGroup>
+  <!-- Do not delete the following Import Project.  While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them. -->
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />
+  <Import Project="$(VSToolsPath)\Node.js Tools\Microsoft.NodejsTools.targets" />
+</Project>

Databasic.BuildCommands.njsproj

@@ -1 +1 @@
-1.2.6.1
+1.2.9.0

GLOBAL_VERSION_NUMBER

@@ -1 +1 @@
-@cscript.exe PostBuild.wsf "c:\works\tec\vb\databasic\Databasic.All\bin\Debug\"
+@cscript.exe PostBuild.wsf "c:\works\tec\vb\databasic\Databasic.All\bin\Release\"

PostBuild.bat

@@ -11,9 +11,12 @@
 			Constructor: function () {
 				//return;
 				try {
-					var destinationDir = Wsh.Fso.GetFolder("../Databasic.NuGetPackages")
+					//Wsh.Echo("DEBUG:"+WScript.Arguments.Item(0));
+					//Wsh.Echo("DEBUG:"+WScript.Arguments.Item(1));
+					var destinationDir = Wsh.Fso.GetFolder("../Databasic.Releases")
 							.path.replace(/\\/g, '/') + '/',
 						buildPath = WScript.Arguments.Item(0).replace(/\\/gi, '/') + '/',
+						projectName = WScript.Arguments.Item(1),
 						folder = Wsh.Fso.GetFolder(buildPath),
 						filesEnum = new Enumerator(folder.files),
 						fileExt = '',
@@ -29,9 +32,17 @@
 					nupkgFiles.sort().reverse();
 					lastNupkgFile = nupkgFiles.shift();
 					Wsh.Fso.CopyFile(
-						buildPath + lastNupkgFile,
-						destinationDir + lastNupkgFile,
-						true // to overwrite existing
+						buildPath + lastNupkgFile, destinationDir + lastNupkgFile, true // to overwrite existing
+					);
+					Wsh.Fso.CopyFile(
+						buildPath + projectName + ".dll", destinationDir + projectName + ".dll", true // to overwrite existing
+					);
+					
+					Wsh.Fso.CopyFile(
+						buildPath + projectName + ".pdb", destinationDir + projectName + ".pdb", true // to overwrite existing
+					);
+					Wsh.Fso.CopyFile(
+						buildPath + projectName + ".xml", destinationDir + projectName + ".xml", true // to overwrite existing
 					);
 					for (var i = 0, l = nupkgFiles.length; i < l; i += 1) {
 						try {
@@ -40,7 +51,7 @@
 					}
 					Wsh.WriteLine("PostBuild.wsf - SUCCESS: New NuGet package copied successfully.");
 				} catch (e) {
-					Wsh.Echo("PostBuild.wsf - ERROR: " + e.message + ".");
+					Wsh.Echo("PostBuild.wsf - ERROR: " + e.message + " (" + e.file + ":" + e.line + ").");
 				}
 			}
 		});

PostBuild.wsf

@@ -22,7 +22,7 @@
 					this.setUpVersionToReadmes();
 					this.incrementGlobalVersionNumberRevision();
 					this.storeGlobalVersionNumber();
-					this.cleanDirectory("../Databasic.NuGetPackages");
+					this.cleanDirectory("../Databasic.Releases", "*");
 					Wsh.WriteLine("PreBuild.wsf - SUCCESS: All version numbers before build updated successfully.");
 				} catch (e) {
 					Wsh.Echo("PreBuild.wsf - ERROR: " + e.message + ".");