Merge pull request #1279 from ashitsalesforce/master

enable build and test on Windows using 7zip
forcedotcom · Sep 23, 2024 · 7cf3021 · 7cf3021
2 parents 41acfce + 3669c9c
commit 7cf3021
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -424,8 +424,11 @@
                   <fileset dir="${basedir}/local-proj-repo/local/swt/" includes="swtlinux*/*/*.jar"/>
                 </copy>
 
-                <apply executable="zip">
-                    <arg value="-d"/>
+                <condition property="zipexec" value="7z" else="zip">
+                    <os family="windows"/>
+                </condition>
+                <apply executable="${zipexec}">
+                   <arg value="-d"/>
                     <srcfile/>
                     <arg value="META-INF/ECLIPSE_.SF"/>
                     <arg value="META-INF/ECLIPSE_.DSA"/>