Feat/msvcdesktop

.docker/desktop-apps.bake.Dockerfile

@@ -10,7 +10,8 @@
 # ==============================================================================
 
 #### DESKTOP-APPS
-FROM core-base AS desktop-builder
+FROM core-base AS desktop-linux
+
     ARG PRODUCT_VERSION
     ARG BUILD_NUMBER
     ARG CACHE_BUST=1
@@ -69,7 +70,8 @@ FROM core-base AS desktop-builder
     COPY ${BRANDING_DIR}/desktop-apps /desktop-apps
     ###
 
-    COPY --from=desktop-js /app/loginpage/deploy /desktop-apps/common/loginpage/deploy
+    COPY --from=desktop-common /index.html /desktop-apps/common/loginpage/deploy/index.html
+    COPY --from=desktop-common /editors/webext/noconnect.html /desktop-apps/common/loginpage/deploy/noconnect.html
     #COPY gcc_64 /qt5
 
     ENV PRODUCT_VERSION=${PRODUCT_VERSION}
@@ -79,15 +81,45 @@ FROM core-base AS desktop-builder
 
     RUN --mount=type=cache,target=/build-cache-desktop,id=build-cache-desktop-${CACHE_BUST} \
         --mount=type=cache,target=/nuget-cache,id=nuget-cache-${CACHE_BUST} \
+        --mount=type=cache,target=/ccache,id=ccache \
+        --mount=type=bind,from=third-party,source=/third_party,target=/third_party_src \
+        --mount=type=secret,id=nextcloud_user \
+        --mount=type=secret,id=nextcloud_pass \
+        export NEXTCLOUD_USER="$(cat /run/secrets/nextcloud_user)" && \
+        export NEXTCLOUD_PASS="$(cat /run/secrets/nextcloud_pass)" && \
+        export CCACHE_DIR=/ccache && \
+        cp -a /third_party_src/. /build-cache-desktop/third_party && \
         cd /build-cache-desktop && \
-        cmake -GNinja -DVCPKG_TARGET_TRIPLET=x64-linux-dynamic \
-              -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
-              -DVCPKG_MANIFEST_MODE=ON \
-              -DVCPKG_MANIFEST_DIR="/core" \
-              -DVCPKG_MANIFEST_FEATURES="desktop-editors" \
-              -DABOUT_PAGE_APP_NAME="${ABOUT_PAGE_APP_NAME}" \
-              /desktop-apps/win-linux/ && \
+        cmake -GNinja \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -DVCPKG_MANIFEST_MODE=ON \
+            -DVCPKG_MANIFEST_DIR="/core" \
+            -DABOUT_PAGE_APP_NAME="${ABOUT_PAGE_APP_NAME}" \
+            /desktop-apps/win-linux/ && \
         cmake --build . && \
         cmake --install . && \
+        ccache --show-stats && \
         cp -a desktopeditors /desktopeditors
 
+    COPY --from=desktop-common / /desktopeditors/
+
+    RUN /desktopeditors/converter/allfontsgen \
+        --use-system=1 \
+        --input=/desktopeditors/fonts \
+        --input=/core-fonts \
+        --allfonts=/desktopeditors/converter/AllFonts.js \
+        --selection=/desktopeditors/converter/font_selection.bin 
+
+    RUN /desktopeditors/converter/allthemesgen \
+        --converter-dir=/desktopeditors/converter \
+        --src=/desktopeditors/editors/sdkjs/slide/themes \
+        --allfonts=/desktopeditors/converter/AllFonts.js \
+        --output=/desktopeditors/editors/sdkjs/common/Images
+
+    RUN rm /desktopeditors/converter/allthemesgen && \
+        rm /desktopeditors/converter/allfontsgen
+
+    RUN echo 'LD_LIBRARY_PATH=$PWD:$PWD/converter:$LD_LIBRARY_PATH LD_PRELOAD=libcef.so ./DesktopEditors' > /desktopeditors/start_desktop.sh && \
+        chmod +x /desktopeditors/start_desktop.sh

package/inno/_code.iss

@@ -210,7 +210,7 @@ procedure initExtensions;
 var
   prefix: string;
 begin
-#ifdef _Euro-Office
+#ifdef _EuroOffice
   SetArrayLength(AudioExts, 28);
 #else
   SetArrayLength(AudioExts, 27);
@@ -245,7 +245,7 @@ begin
   AudioExts[24] := 'FODT';
   AudioExts[25] := 'VSDX';
   AudioExts[26] := 'XLSM';
-#ifdef _Euro-Office
+#ifdef _EuroOffice
   AudioExts[27] := 'DOCXF';
 #endif
 
@@ -281,7 +281,7 @@ begin
   ExtensionRegistryInfo[24] := prefix + 'Fodt:'         + ExpandConstant('{cm:extFODT}')            + ':' + '35';
   ExtensionRegistryInfo[25] := prefix + 'Vsdx:'         + ExpandConstant('{cm:extVSDX}')            + ':' + '36';
   ExtensionRegistryInfo[26] := prefix + 'Xlsm:'         + ExpandConstant('{cm:extXLSM}')            + ':' + '37';
-#ifdef _Euro-Office
+#ifdef _EuroOffice
   ExtensionRegistryInfo[27] := prefix + 'Docxf:'        + ExpandConstant('{cm:extDOCXF}')           + ':' + '13';
 #endif
 end;
@@ -485,7 +485,7 @@ begin
   args := ['new.docx:.docx:.Document.12:7:1000:1100',
            'new.pptx:.pptx:.Show.12:9:1002:1102',
            'new.xlsx:.xlsx:.Sheet.12:10:1001:1101'
-#ifdef _Euro-Office
+#ifdef _EuroOffice
            ,'new.pdf:.pdf:.Pdf:5:1003:1103'
 #endif
            ];
@@ -586,7 +586,7 @@ begin
   AddToDefaultPrograms;
   AddContextMenuNewItems;
 
-#ifndef _Euro-Office
+#ifndef _EuroOffice
   //TODO: for bug 55795. remove for ver 7.3
   SetArrayLength(cleanExts, 1);
   SetArrayLength(extensionInfo, 1);
@@ -674,7 +674,7 @@ begin
   RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE, ExpandConstant('Software\Classes\.docx\{#ASCC_REG_PREFIX}.Document.12'));
   RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE, ExpandConstant('Software\Classes\.pptx\{#ASCC_REG_PREFIX}.Show.12'));
   RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE, ExpandConstant('Software\Classes\.xlsx\{#ASCC_REG_PREFIX}.Sheet.12'));
-#ifdef _Euro-Office
+#ifdef _EuroOffice
   RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE, ExpandConstant('Software\Classes\.pdf\{#ASCC_REG_PREFIX}.Pdf'));
 #endif
 end;

package/inno/common.iss

@@ -115,7 +115,7 @@ Compression=lzma2/ultra64
 LZMAUseSeparateProcess=yes
 
 [Languages]
-#ifdef _Euro-Office
+#ifdef _EuroOffice
 Name: en; MessagesFile: compiler:Default.isl;
 Name: ru; MessagesFile: compiler:Languages\Russian.isl;
 #else
@@ -230,7 +230,7 @@ Name: {group}\{cm:Uninstall}; IconFilename: {app}\{#iconsExe}; IconIndex: 25; Fi
 Name: "{group}\{cm:jumpDOCX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 14; Filename: "{app}\{#iconsExe}"; Parameters: "--new:word";
 Name: "{group}\{cm:jumpXLSX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 15; Filename: "{app}\{#iconsExe}"; Parameters: "--new:cell";
 Name: "{group}\{cm:jumpPPTX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 16; Filename: "{app}\{#iconsExe}"; Parameters: "--new:slide";
-#ifdef _Euro-Office
+#ifdef _EuroOffice
 Name: "{group}\{cm:jumpDOCXF}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 17; Filename: "{app}\{#iconsExe}"; Parameters: "--new:form";
 #endif
 
@@ -260,7 +260,7 @@ Root: HKLM; Subkey: Software\Classes\{#ASSOC_PROG_ID}\DefaultIcon;          Valu
 Root: HKLM; Subkey: Software\Classes\{#ASSOC_PROG_ID}\shell\open\command;   ValueType: string; ValueName:; ValueData: """{app}\{#iconsExe}"" ""%1""";
 Root: HKLM; Subkey: Software\Classes\{#ASSOC_PROG_ID}\shell\open;           ValueType: string; ValueName: FriendlyAppName; ValueData: {#ASSOC_APP_FRIENDLY_NAME};
 
-#ifdef _Euro-Office
+#ifdef _EuroOffice
 Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}"; ValueType: "string"; ValueData: "URL:{#sAppName} Protocol"; Flags: uninsdeletekey;
 Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "";
 Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#iconsExe},0";

package/inno/help.iss

@@ -68,7 +68,7 @@ Compression=lzma2/ultra64
 LZMAUseSeparateProcess=yes
 
 [Languages]
-#ifdef _Euro-Office
+#ifdef _EuroOffice
 Name: en;    MessagesFile: compiler:Default.isl;
 Name: be;    MessagesFile: compiler:Languages\Belarusian.isl;
 Name: bg;    MessagesFile: compiler:Languages\Bulgarian.isl;

package/make_inno.ps1

@@ -105,8 +105,8 @@ $InnoArgs = "/DVERSION=$Version",
 if ($BrandingDir) {
     $InnoArgs += "/DBRANDING_DIR=$BrandingDir"
 }
-if ($CompanyName -eq "euro-office") {
-    $InnoArgs += "/D_Euro-Office"
+if ($CompanyName -eq "Euro-Office") {
+    $InnoArgs += "/D_EuroOffice"
 }
 switch ($Target) {
     "commercial" {