Use MSI package

portapps · Apr 26, 2021 · 056d4e8 · 056d4e8
1 parent 914977d
commit 056d4e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/build.properties b/build.properties
@@ -4,7 +4,7 @@ core.dir = ../portapps
 # App
 app = nextcloud
 app.name = Nextcloud
-app.type = archive
+app.type = msi
 app.version = 3.2.0
 app.release = 13
 app.homepage = https://nextcloud.com
@@ -17,12 +17,12 @@ papp.desc = ${app.name} portable on Windows by Portapps
 papp.url = https://github.com/portapps/${papp.id}
 papp.folder = app
 
-# Archive
-archive.extract.overwrite = -aoa
+# MSI
+msi.app = SourceDir
 
 # Official artifacts
 atf.id = Nextcloud
 atf.win64.filename = ${atf.id}-${app.version}-setup
-atf.win64.ext = .exe
-atf.win64.url = https://download.nextcloud.com/desktop/releases/Windows/Nextcloud-${app.version}-setup.exe
-atf.win64.assertextract = nextcloud.exe
+atf.win64.ext = .msi
+atf.win64.url = https://download.nextcloud.com/desktop/releases/Windows/Nextcloud-${app.version}-x64.msi
+atf.win64.assertextract = ${msi.app}/PFiles/Nextcloud/nextcloud.exe
diff --git a/build.xml b/build.xml
@@ -17,28 +17,15 @@
   <target name="release" depends="release.app" description="Release"/>
 
   <target name="prepare">
-    <delete dir="${extract.path}\$PLUGINSDIR"/>
-    <delete dir="${extract.path}\$R2"/>
-    <delete>
-      <fileset dir="${extract.path}" defaultexcludes="no" includes="$R*"/>
-    </delete>
-    <delete file="${extract.path}\uninstall.exe.nsis"/>
-    <delete>
-      <fileset dir="${extract.path}" defaultexcludes="no">
-        <filename name="vcredist*"/>
-      </fileset>
-    </delete>
+    <echo message="Preparing release..."/>
 
-    <!-- i18n folder -->
-    <delete dir="${extract.path}\i18n\$R2"/>
-    <delete>
-      <fileset dir="${extract.path}\i18n" defaultexcludes="no" includes="$R*"/>
-    </delete>
-    <delete>
-      <fileset dir="${extract.path}\i18n" defaultexcludes="no">
-        <filename name="vcredist*"/>
-      </fileset>
-    </delete>
+    <move todir="${tmp.path}\extract2">
+      <fileset dir="${extract.path}\${msi.app}\PFiles\Nextcloud" defaultexcludes="no"/>
+    </move>
+    <delete dir="${extract.path}"/>
+    <move todir="${extract.path}\${msi.app}">
+      <fileset dir="${tmp.path}\extract2" defaultexcludes="no"/>
+    </move>
   </target>
 
 </project>