Update windows build (#1393)

* Compile rust in a pre-build event

* Add msbuild to windows compilation docs

* Update CHANGES.TXT

.github/workflows/build_windows.yml

@@ -33,15 +33,12 @@ jobs:
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
-      - name: pre rust build
+      - name: build Release
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: .\rust.bat
-        working-directory: ./windows
-      - name: build Release
         run: msbuild ccextractor.sln /p:Configuration=Release /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -68,15 +65,12 @@ jobs:
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
-      - name: pre rust build
+      - name: build Debug
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: .\rust.bat
-        working-directory: ./windows
-      - name: build Debug
         run: msbuild ccextractor.sln /p:Configuration=Debug /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -108,15 +102,12 @@ jobs:
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
-      - name: pre rust build
+      - name: build Release-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: .\rustx86.bat
-        working-directory: ./windows
-      - name: build Release
         run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=Win32
         working-directory: ./windows
       - name: Display version information
@@ -147,15 +138,12 @@ jobs:
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
-      - name: pre rust build
+      - name: build Debug-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: .\rustx86.bat
-        working-directory: ./windows
-      - name: build Debug
         run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=Win32
         working-directory: ./windows
       - name: Display version information

docs/CHANGES.TXT

@@ -3,6 +3,7 @@
 - BOM is no longer enabled by default on windows platforms
 - CEA-708: Rust decoder is now default instead of C decoder
 - Fix: Mac Build processes
+- Fix: Fix bug with negative delay parameter
 
 0.93 (2021-08-16)
 -----------------

docs/COMPILATION.MD

@@ -196,6 +196,8 @@ make
 Once set up, you can run the GUI interface from the terminal `./ccextractorGUI`
 
 ## Windows
+Dependencies are clang and rust. To enable OCR, rust i686-pc-windows-msvc target should be installed 
+
 Note: Following screenshots and steps are based on Visual Studio 2017, but they should be more or less same for other versions.
 
 1.Open `windows/` directory to locate `ccextractor.vcxproj`,  `ccextractorGUI.vcxproj` (blue arrows) and `ccextractor.sln` (red arrow).
@@ -234,6 +236,22 @@ cmake ../src/ -G "Visual Studio 14 2015"
 cmake --build . --config Release --ccextractor
 ```
 
+### Using MSBuild
+
+Run the following command in `windows/` directory
+
+```bash
+msbuild ccextractor.sln /p:Configuration=Release /p:Platform=x64
+```
+Different configuration options are,
+
+| Configuration | Platform | Rust target required |
+| ------------- |:-------------:| -----:|
+| Release | x64 | default |
+| Debug | x64 | default |
+| Release-Full(OCR) | Win32 | i686-pc-windows-msvc |
+| Debug-Full(OCR) | Win32 | i686-pc-windows-msvc |
+
 ## Building Installation Packages
 
 ### Arch Linux

windows/ccextractor.vcxproj

@@ -499,6 +499,9 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
     </Link>
+    <PreBuildEvent>
+      <Command>call rust.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Full|Win32'">
     <ClCompile>
@@ -527,6 +530,9 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <AdditionalLibraryDirectories>$(ProjectDir)libs\lib\ffmpeg-lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>call rustx86.bat</Command>
+    </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\avcodec-57.dll" "$(ProjectDir)$(OutDir)"
 xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\avformat-57.dll" "$(ProjectDir)$(OutDir)"
@@ -593,7 +599,8 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swresample-2.dll" "$(ProjectDir)$(Out
 xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir)"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>pre-build.bat</Command>
+      <Command>call pre-build.bat
+        call rustx86.bat</Command>
     </PreBuildEvent>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -619,7 +626,7 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
       <AdditionalLibraryDirectories>$(ProjectDir)libs\lib\ffmpeg-lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
-      <Command>pre-build.bat</Command>
+      <Command>call pre-build.bat</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy /y "$(ProjectDir)libs\lib\liblept172.dll" "$(ProjectDir)$(OutDir)"
@@ -648,7 +655,7 @@ xcopy /y "$(ProjectDir)libs\lib\libtesseract304d.dll" "$(ProjectDir)$(OutDir)"</
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <PreBuildEvent>
-      <Command>pre-build.bat</Command>
+      <Command>call pre-build.bat</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\avcodec-57.dll" "$(ProjectDir)$(OutDir)"
@@ -676,7 +683,8 @@ xcopy /y "$(ProjectDir)libs\lib\ffmpeg-lib\swscale-4.dll" "$(ProjectDir)$(OutDir
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
     <PreBuildEvent>
-      <Command>pre-build.bat</Command>
+      <Command>call pre-build.bat
+      call rust.bat </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />