From bd62d16484f9ebec61e19f1c2c849930229fbc88 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 19 Oct 2017 13:52:25 -0400 Subject: [PATCH] Now lets see if this works --- Tools/Doxyfile | 2 +- Tools/TGS3Build.ps1 | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Tools/Doxyfile b/Tools/Doxyfile index a323f80087..2cab89ff8e 100644 --- a/Tools/Doxyfile +++ b/Tools/Doxyfile @@ -1122,7 +1122,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = html +HTML_OUTPUT = . # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/Tools/TGS3Build.ps1 b/Tools/TGS3Build.ps1 index 40592627d6..342a560fcc 100644 --- a/Tools/TGS3Build.ps1 +++ b/Tools/TGS3Build.ps1 @@ -6,11 +6,14 @@ $doxdir = "C:\tgsdox" New-Item -Path $doxdir -ItemType directory -$publish_dox = (-not (Test-Path Env:APPVEYOR_PULL_REQUEST_NUMBER)) -and ("$Env:APPVEYOR_REPO_BRANCH" -eq "master") +#$publish_dox = (-not (Test-Path Env:APPVEYOR_PULL_REQUEST_NUMBER)) -and ("$Env:APPVEYOR_REPO_BRANCH" -eq "master") +$publish_dox = $TRUE +$github_url = "github.com/$Env:APPVEYOR_REPO_NAME" if($publish_dox){ - git clone -b gh-pages --single-branch https://git@github.com/$Env:APPVEYOR_REPO_NAME doxdir - rm -rf "$doxdir\*" + echo "Cloning https://git@$github_url..." + git clone -b gh-pages --single-branch "https://git@$github_url" "$doxdir" 2>$null + rm -r "$doxdir\*" } Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico" @@ -21,9 +24,10 @@ if($publish_dox){ git config --global push.default simple git config user.name "Appveyor CI" git config user.email "ci@appveyor.com" + echo '# THIS BRANCH IS AUTO GENERATED BY APPVEYOR CI. SEE Tools/TGS3Build.ps1 ON MASTER' > README.md git add --all git commit -m "Deploy code docs to GitHub Pages for Appveyor build $Env:APPVEYOR_BUILD_NUMBER" -m "Commit: $Env:APPVEYOR_REPO_COMMIT" - git push --force origin gh-pages > /dev/null 2>&1 + git push -f "https://$Env:repo_token@$github_url" 2>&1 | out-null } $destination = "$bf\TGS3-Server-v$version.exe" @@ -32,9 +36,9 @@ Move-Item -Path "$src\TG Station Server Installer.exe" -Destination "$destinatio Add-Type -assembly "system.io.compression.filesystem" -$destination_md5sha = $Env:APPVEYOR_BUILD_FOLDER + "\MD5-SHA1-Server-v$version.txt" +$destination_md5sha = "$bf\MD5-SHA1-Server-v$version.txt" -$src2 = $Env:APPVEYOR_BUILD_FOLDER + "\ClientApps" +$src2 = "$bf\ClientApps" [system.io.directory]::CreateDirectory($src2) Copy-Item "$bf\TGCommandLine\bin\x86\Release\TGCommandLine.exe" "$src2\TGCommandLine.exe" Copy-Item "$bf\TGControlPanel\bin\x86\Release\TGControlPanel.exe" "$src2\TGControlPanel.exe" @@ -43,7 +47,7 @@ Copy-Item "$bf\TGServiceInterface\bin\x86\Release\TGServiceInterface.dll" "$src2 $dest2 = "$bf\TGS3-Client-v$version.zip" [io.compression.zipfile]::CreateFromDirectory($src2, $dest2) -$destination_md5sha2 = $Env:APPVEYOR_BUILD_FOLDER + "\MD5-SHA1-Client-v$version.txt" +$destination_md5sha2 = "$bf\MD5-SHA1-Client-v$version.txt" & fciv -both $destination > $destination_md5sha & fciv -both $dest2 > $destination_md5sha2