Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Move distribution to CDN server

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-12-03 17:05:10 +01:00
parent be687497e8
commit 94cbed643d
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -18,7 +18,8 @@
# #
OUTPUT_DIR=output OUTPUT_DIR=output
PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola PUBLISH_DIR_LEGACY=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola
!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
PLAT=x64 PLAT=x64
@ -79,7 +80,7 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
!INCLUDE "include\MSIBuildCfg.mak" !INCLUDE "include\MSIBuildCfg.mak"
PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR) PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR) PUBLISH_PACKAGE_URL=http://prenos.amebis.si/ZRCola/$(MSIBUILD_VERSION_STR)
###################################################################### ######################################################################
# Main targets # Main targets
@ -95,10 +96,12 @@ All :: \
PublishPre :: \ PublishPre :: \
"$(PUBLISH_PACKAGE_DIR)" \ "$(PUBLISH_PACKAGE_DIR)" \
"$(PUBLISH_DIR_LEGACY)" \
"$(PUBLISH_DIR)" "$(PUBLISH_DIR)"
Publish :: \ Publish :: \
PublishPre \ PublishPre \
"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \
"$(PUBLISH_DIR)\catalog-0000.xml" "$(PUBLISH_DIR)\catalog-0000.xml"
@ -173,6 +176,7 @@ UnregisterShortcuts ::
"$(OUTPUT_DIR)" \ "$(OUTPUT_DIR)" \
"$(OUTPUT_DIR)\Keys" \ "$(OUTPUT_DIR)\Keys" \
"$(OUTPUT_DIR)\locale" \ "$(OUTPUT_DIR)\locale" \
"$(PUBLISH_DIR_LEGACY)" \
"$(PUBLISH_DIR)" \ "$(PUBLISH_DIR)" \
"$(PUBLISH_PACKAGE_DIR)" \ "$(PUBLISH_PACKAGE_DIR)" \
"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" : "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
@ -213,9 +217,12 @@ UnregisterShortcuts ::
# Building # Building
###################################################################### ######################################################################
"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
copy /y $** $@ > NUL
"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml" "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
if exist $@ del /f /q $@ copy /y $** $@ > NUL
"$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" $** $@ attrib.exe +h $@
"$(OUTPUT_DIR)\catalog.xml" : \ "$(OUTPUT_DIR)\catalog.xml" : \
# "$(OUTPUT_DIR)\ZRColaDe32.msi" \ # "$(OUTPUT_DIR)\ZRColaDe32.msi" \
@ -227,7 +234,6 @@ UnregisterShortcuts ::
"$(OUTPUT_DIR)\ZRColaSl32.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.msi" \
"$(OUTPUT_DIR)\ZRColaSl64.msi" "$(OUTPUT_DIR)\ZRColaSl64.msi"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
# "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi" # "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi"
# "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi" # "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi"
@ -237,7 +243,8 @@ UnregisterShortcuts ::
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi" "$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
move /y "$(@:"=).tmp" $@ > NUL "$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@
-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
!ENDIF !ENDIF

2
README.md
View File

@ -6,7 +6,7 @@ A Microsoft Windows application for composing texts using a wide range of Slavic
http://zrcola.zrc-sazu.si/en/ http://zrcola.zrc-sazu.si/en/
## Binaries for Download ## Binaries for Download
https://www.amebis.si/prenos/ZRCola/ https://prenos.amebis.si/ZRCola/
## Building ## Building

2
ZRColaInstall/main.cpp
View File

@ -79,7 +79,7 @@ extern "C" void WinMainCRTStartup()
}; };
FormatMessage( FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING, FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
TEXT("/i \"http://www.amebis.si/prenos/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""), TEXT("/i \"https://prenos.amebis.si/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""),
0, 0,
0, 0,
(LPTSTR)&pszParams, (LPTSTR)&pszParams,

4
include/UpdaterCfg.h
View File

@ -4,7 +4,7 @@
// Update server(s) // Update server(s)
// Zero delimited list of update servers // Zero delimited list of update servers
// //
#define UPDATER_HTTP_SERVER "www.amebis.si\0" #define UPDATER_HTTP_SERVER "prenos.amebis.si\0"
// //
// Update server port // Update server port
@ -14,4 +14,4 @@
// //
// Update server catalog location // Update server catalog location
// //
#define UPDATER_HTTP_PATH "/prenos/ZRCola/catalog-0000.xml" #define UPDATER_HTTP_PATH "/ZRCola/catalog-0000.xml"