Permalink
Browse files

- fix for missing apps

  • Loading branch information...
cozy1 committed Jan 29, 2019
1 parent 27063a4 commit 27dec27b97de900684f9af61d6a7078bfc1f26a5
Showing with 63 additions and 58 deletions.
  1. +0 −3 RocksmithTookitGUI/MainForm.cs
  2. +3 −0 RocksmithTookitGUI/Program.cs
  3. +1 −1 RocksmithTookitGUI/Properties/AssemblyInfo.cs
  4. +2 −1 RocksmithTookitGUI/ReleaseNotes.txt
  5. +1 −1 RocksmithTookitGUI/RocksmithToolkitGUI.csproj
  6. +2 −8 RocksmithToolkitCLI/convert2012/convert2012.csproj
  7. +4 −4 RocksmithToolkitGUI.Tests/RocksmithToolkitGUI.Tests.csproj
  8. +4 −4 RocksmithToolkitLib.Tests/RocksmithToolkitLib.Tests.csproj
  9. +35 −28 RocksmithToolkitLib/Extensions/ExternalApps.cs
  10. +1 −1 RocksmithToolkitLib/Properties/AssemblyInfo.cs
  11. +1 −1 RocksmithToolkitUpdater/Properties/AssemblyInfo.cs
  12. 0 {Third-party Apps → ThirdPartyApps}/CLI_CdlcConverter.bat
  13. 0 {Third-party Apps → ThirdPartyApps}/CLI_PackageCreator.bat
  14. 0 {Third-party Apps → ThirdPartyApps}/CLI_Packer.bat
  15. 0 {Third-party Apps → ThirdPartyApps}/CLI_ReadPID.bat
  16. 0 {Third-party Apps → ThirdPartyApps}/CLI_RestorePID.bat
  17. 0 {Third-party Apps → ThirdPartyApps}/CLI_Unpacker.bat
  18. 0 {Third-party Apps → ThirdPartyApps}/CLI_WritePID.bat
  19. BIN {Third-party Apps → ThirdPartyApps}/Wwise2010.tar.bz2
  20. BIN {Third-party Apps → ThirdPartyApps}/Wwise2013.tar.bz2
  21. BIN {Third-party Apps → ThirdPartyApps}/Wwise2014.tar.bz2
  22. BIN {Third-party Apps → ThirdPartyApps}/Wwise2015.tar.bz2
  23. BIN {Third-party Apps → ThirdPartyApps}/Wwise2016.tar.bz2
  24. BIN {Third-party Apps → ThirdPartyApps}/Wwise2017.tar.bz2
  25. BIN {Third-party Apps → ThirdPartyApps}/cgm/Default_Inlay_24_CGM.cgm
  26. BIN {Third-party Apps → ThirdPartyApps}/cgm/Default_Inlay_CGM.cgm
  27. BIN {Third-party Apps → ThirdPartyApps}/cgm/Fret_Notes_24_Cozy1.cgm
  28. BIN {Third-party Apps → ThirdPartyApps}/cgm/Fret_Notes_Cozy1.cgm
  29. BIN {Third-party Apps → ThirdPartyApps}/ddc/ddc.exe
  30. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_chords_protector.xml
  31. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_chords_remover.xml
  32. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_dd_remover.xml
  33. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_default.cfg
  34. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_default.xml
  35. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_keep_all_levels.cfg
  36. 0 {Third-party Apps → ThirdPartyApps}/ddc/ddc_merge_all_levels.cfg
  37. 0 {Third-party Apps → ThirdPartyApps}/ddc/license.txt
  38. 0 {Third-party Apps → ThirdPartyApps}/ddc/readme.txt
  39. 0 ThirdPartyApps/tmp/FolderPlaceHoder
  40. BIN {Third-party Apps → ThirdPartyApps}/tools/7za.exe
  41. BIN {Third-party Apps → ThirdPartyApps}/tools/CreateToolkitShortcut.exe
  42. 0 {Third-party Apps → ThirdPartyApps}/tools/OpenCmd.bat
  43. BIN {Third-party Apps → ThirdPartyApps}/tools/core.jar
  44. BIN {Third-party Apps → ThirdPartyApps}/tools/nvdxt.exe
  45. BIN {Third-party Apps → ThirdPartyApps}/tools/oggCut.exe
  46. BIN {Third-party Apps → ThirdPartyApps}/tools/oggdec.exe
  47. BIN {Third-party Apps → ThirdPartyApps}/tools/oggenc.exe
  48. BIN {Third-party Apps → ThirdPartyApps}/tools/packed_codebooks.bin
  49. BIN {Third-party Apps → ThirdPartyApps}/tools/packed_codebooks_aoTuV_603.bin
  50. 0 {Third-party Apps → ThirdPartyApps}/tools/readme.txt
  51. BIN {Third-party Apps → ThirdPartyApps}/tools/revorb.exe
  52. BIN {Third-party Apps → ThirdPartyApps}/tools/topng.exe
  53. BIN {Third-party Apps → ThirdPartyApps}/tools/ww2ogg.exe
  54. +1 −1 VersionInfo.txt
  55. +8 −5 appveyor.yml
@@ -37,9 +37,6 @@ public MainForm(string[] args)
if (GeneralExtensions.IsInDesignMode)
btnDevTestMethod.Visible = true;

// verify external apps in 'tools' and 'ddc' directory
ExternalApps.VerifyExternalApps();

InitMainForm();
}

@@ -26,6 +26,9 @@ static void Main(string[] args)
// TODO: figure out way for native mac\linux OS
var logPath = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "_RSToolkit_" + DateTime.Now.ToString("yyyy-MM-dd") + ".log");

// verify external apps in 'tools' and 'ddc' directory
ExternalApps.VerifyExternalApps(); // throws necessary exception if missing

// workaround fix for Win10 NET4.6 compatiblity issue
var updaterVersion = "Null";
try
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyInformationalVersion("27063a46")]
[assembly: AssemblyConfiguration("")]
@@ -1,6 +1,7 @@
Rocksmith Toolkit Release Notes

- add App.config file (fixes some Win10 errors)
- improved verification of external apps
- added app.config file (may avoid some errors)
- fixed Auto Updater to work with new file directory structure and improved function
- set "Auto Update" to true in GeneralConfig as default and force use of latest build
- added 'assemblyPath' enumeration to Auto Update feature
@@ -441,7 +441,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>REM copy support files
xcopy /S /Y "$(SolutionDir)Third-party Apps"</PreBuildEvent>
xcopy /E /S /Y "$(SolutionDir)ThirdPartyApps\*.*" "$(TargetDir)*.*"</PreBuildEvent>
<!-- be sure to address all build types in the PostBuildEvent -->
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">
xcopy /S /Y "$(SolutionDir)Third-party Apps"
@@ -83,14 +83,8 @@
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>xcopy /S /Y "$(SolutionDir)Third-party Apps\Wwise\*" "$(TargetDir)Wwise\*"
xcopy /S /Y "$(SolutionDir)Third-party Apps\ogg*.*" "$(TargetDir)"
xcopy /S /Y "$(SolutionDir)Third-party Apps\nvdxt.exe" "$(TargetDir)"
xcopy /S /Y "$(SolutionDir)Third-party Apps\packed_codebook*.*" "$(TargetDir)"
xcopy /S /Y "$(SolutionDir)Third-party Apps\revorb.exe" "$(TargetDir)"
xcopy /S /Y "$(SolutionDir)Third-party Apps\ww2ogg.exe" "$(TargetDir)"
xcopy /S /Y "$(SolutionDir)Third-party Apps\*.xml" "$(TargetDir)"
rd /s /q "$(TargetDir)ddc"</PostBuildEvent>
<PostBuildEvent>REM copy support files
xcopy /E /S /Y "$(SolutionDir)ThirdPartyApps\*.*" "$(TargetDir)*.*"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -59,12 +59,12 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PreBuildEvent>REM copy support files
xcopy /E /S /Y "$(SolutionDir)ThirdPartyApps\*.*" "$(TargetDir)*.*"</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>REM copy support files
xcopy /S /Y "$(SolutionDir)Third-party Apps" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -76,12 +76,12 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>REM copy support files
xcopy /S /Y "$(SolutionDir)Third-party Apps" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PreBuildEvent>REM copy support files
xcopy /E /S /Y "$(SolutionDir)ThirdPartyApps\*.*" "$(TargetDir)*.*"</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -27,47 +27,54 @@ public static class ExternalApps

public static bool VerifyExternalApps()
{
var errMsg = new StringBuilder();
try
{
var errMsg = new StringBuilder();

// Verifying third party apps exist where toolkit expects to find them
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_TOPNG)))
errMsg.AppendLine(APP_TOPNG);
// Verifying third party apps exist where toolkit expects to find them
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_TOPNG)))
errMsg.AppendLine(APP_TOPNG);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_7Z)))
errMsg.AppendLine(APP_7Z);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_7Z)))
errMsg.AppendLine(APP_7Z);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_NVDXT)))
errMsg.AppendLine(APP_NVDXT);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_NVDXT)))
errMsg.AppendLine(APP_NVDXT);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGDEC)))
errMsg.AppendLine(APP_OGGDEC);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGDEC)))
errMsg.AppendLine(APP_OGGDEC);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGCUT)))
errMsg.AppendLine(APP_OGGCUT);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGCUT)))
errMsg.AppendLine(APP_OGGCUT);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGENC)))
errMsg.AppendLine(APP_OGGENC);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_OGGENC)))
errMsg.AppendLine(APP_OGGENC);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_COREJAR)))
errMsg.AppendLine(APP_COREJAR);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_COREJAR)))
errMsg.AppendLine(APP_COREJAR);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_WW2OGG)))
errMsg.AppendLine(APP_WW2OGG);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_WW2OGG)))
errMsg.AppendLine(APP_WW2OGG);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_REVORB)))
errMsg.AppendLine(APP_REVORB);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_REVORB)))
errMsg.AppendLine(APP_REVORB);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_CODEBOOKS)))
errMsg.AppendLine(APP_CODEBOOKS);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_CODEBOOKS)))
errMsg.AppendLine(APP_CODEBOOKS);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_CODEBOOKS_603)))
errMsg.AppendLine(APP_CODEBOOKS_603);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_CODEBOOKS_603)))
errMsg.AppendLine(APP_CODEBOOKS_603);

if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_DDC)))
errMsg.AppendLine(APP_DDC);
if (!File.Exists(Path.Combine(TOOLKIT_ROOT, APP_DDC)))
errMsg.AppendLine(APP_DDC);

if (!String.IsNullOrEmpty(errMsg.ToString()))
throw new FileNotFoundException("<ERROR> Critical toolkit files not found:" + Environment.NewLine + errMsg.ToString());
if (!String.IsNullOrEmpty(errMsg.ToString()))
throw new FileNotFoundException("<ERROR> Critical toolkit files not found:" + Environment.NewLine + errMsg.ToString());
}
catch (Exception ex)
{
throw new FileNotFoundException("<ERROR> Critical toolkit files not found:" + Environment.NewLine + ex.Message);
}

return true;
}
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyInformationalVersion("27063a46")]
[assembly: AssemblyConfiguration("")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyInformationalVersion("27063a46")]
[assembly: AssemblyConfiguration("")]
File renamed without changes.
@@ -1,3 +1,3 @@
2.9.2.0
71de56d6
27063a46

@@ -40,6 +40,7 @@ before_build:
# scripts to run after build
after_build:
- set BIN=%APPVEYOR_BUILD_FOLDER%\RocksmithTookitGUI\bin
- set APPS=%APPVEYOR_BUILD_FOLDER%\RocksmithTookitGUI\ThirdPartyApps
- rem Code signing
- ps: if ($env:cert_url) { Start-FileDownload $env:cert_url }
- if defined cert_url signtool sign /v /f selfsigned2018.pfx /p "%cert_pass%" /t http://timestamp.verisign.com/scripts/timstamp.dll "%BIN%\Release\RocksmithToolkitGUI.exe" "%BIN%\Release\RocksmithToolkitUpdater.exe" "%BIN%\Release\RocksmithToolkitLib.dll"
@@ -48,12 +49,14 @@ after_build:
- ps: $env:BuildCommit = $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
- ps: $env:PkgName = "rstoolkit-" + $env:BuildVer + "-" + $env:BuildCommit
- rem Windows package
- rem ensure ThirdPartyApps are copied
- rem xcopy /E /S /Y "%APPS\*.*" "%BIN%\Release\*.*"
- mkdir "%BIN%\tmp"
- xcopy /S /Y "%BIN%\Release\*" "%BIN%\tmp\RocksmithToolkit\*"
- copy /Y "%BIN%\Release\ReadMe.txt" "%BIN%\tmp\ReadMe.txt"
- copy /Y "%BIN%\Release\tools\CreateToolkitShortcut.exe" "%BIN%\tmp\CreateToolkitShortcut.exe"
- del /Q "%BIN%\Release\ReadMe.txt"
- del /Q "%BIN%\Release\tools\CreateToolkitShortcut.exe"
- xcopy /E /S /Y "%BIN%\Release\*.*" "%BIN%\tmp\RocksmithToolkit\*.*"
- copy "%BIN%\Release\ReadMe.txt" "%BIN%\tmp\ReadMe.txt"
- copy "%BIN%\Release\tools\CreateToolkitShortcut.exe" "%BIN%\tmp\CreateToolkitShortcut.exe"
- del "%BIN%\Release\ReadMe.txt"
- del "%BIN%\Release\tools\CreateToolkitShortcut.exe"
- 7z a %PkgName%-win.zip %BIN%\tmp\*
- rem Mac package
- del "%BIN%\RocksmithCustomSongToolkit.app\Contents\Resources\gitkeep.txt"

0 comments on commit 27dec27

Please sign in to comment.