Trying to fix tar.gz archive - (Task #81)

- Try to use p2 materialization to see if execution flag is correctly
set.
- also adjusted deployment to new file structure

---
Task #78: Update IDE

de.dlr.sc.virsat.ide.product/pom.xml

@@ -23,10 +23,9 @@
 
  <properties>
  <build.folder.application>VirSatIDEBinary</build.folder.application>
- <build.folder.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}</build.folder.fullpath>
- <build.file.win32.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.win32}</build.file.win32.fullpath>
- <build.file.linux.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.linux}</build.file.linux.fullpath>
-
+ <build.folder.fullpath.bin>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}</build.folder.fullpath.bin>
+ <build.file.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file}</build.file.fullpath>
+
  <build.folder.application.p2>VirSat4_IDE</build.folder.application.p2>
  <build.folder.fullpath.p2>${build.folder.target.p2}/${build.folder.application.p2}/${build.folder.type}</build.folder.fullpath.p2>
  </properties>
@@ -73,7 +72,7 @@
  <configuration>
  <target>
  <fail
- message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
+ message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath.p2} !!!">
  <condition>
  <and>
  <equals arg1="${build.deploy.release}" arg2="true" />
@@ -98,27 +97,27 @@
  <configuration>
  <target>
  <fail
- message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
+ message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath.bin} !!!">
  <condition>
  <and>
  <equals arg1="${build.deploy.release}" arg2="true" />
- <available file="${build.folder.fullpath}" type="dir" />
+ <available file="${build.folder.fullpath.bin}" type="dir" />
  </and>
  </condition>
  </fail>
 
  <!-- ANT Script Start -->
- <mkdir dir="${build.folder.fullpath}" />
-
- <delete file="${build.file.win32.fullpath}" />
- <delete file="${build.file.linux.fullpath}" />
-
- <zip destfile="${build.file.win32.fullpath}"
-  basedir="./target/products/de.dlr.sc.virsat.ide.product/win32/win32/x86_64" />
- <tar destfile="${build.file.linux.fullpath}"
-  basedir="./target/products/de.dlr.sc.virsat.ide.product/linux/gtk/x86_64"
-  compression="gzip"
- longfile="gnu" />
+ <delete dir="${build.folder.fullpath.bin}" />
+ <copy toDir="${build.folder.fullpath.bin}">
+  <fileset dir="./target/products/">
+  <include name="*.tar.gz"/>
+ <include name="*.zip"/>
+  </fileset>
+ </copy>
+
+ <!--<copy file="./target/products/*.tar.gz" toDir="${build.file.fullpath}"/>
+ <copy file="./target/products/*.*" toDir="${build.file.fullpath}"/>
+-->
  <!-- ANT Script Stop -->
  </target>
  </configuration>

maven/pom.xml

@@ -73,8 +73,6 @@
  <maven.build.timestamp.format>'d'yyyyMMddHHmm</maven.build.timestamp.format>
  <build.folder.type>development</build.folder.type>
  <build.file>VirSat_IDE_Development</build.file>
- <build.file.win32>VirSat_IDE_Development_Win32.zip</build.file.win32>
- <build.file.linux>VirSat_IDE_Development_Linux.tar.gz</build.file.linux>
  <p2.repo.virsat.id>DVLM-Tools-Feature-Development</p2.repo.virsat.id>
  <p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/</p2.repo.virsat.url>
  <!-- p2.repo.virsat.url>file:/C:/git/VirtualSatellite4-Core/builds/p2/VirSat4_Dvlm_ConceptIDE/development</p2.repo.virsat.url -->
@@ -88,8 +86,7 @@
  <build.qualifier>'i'yyyyMMddHHmm</build.qualifier>
  <maven.build.timestamp.format>'i'yyyyMMddHHmm</maven.build.timestamp.format>
  <build.folder.type>integration/${build.version}</build.folder.type>
- <build.file.win32>VirSat_IDE_Integration_${build.version}_Win32.zip</build.file.win32>
- <build.file.linux>VirSat_IDE_Integration_${build.version}_Linux.tar.gz</build.file.linux>
+ <build.file>VirSat_IDE_Integration_${build.version}</build.file>
  <p2.repo.virsat.id>DVLM-Tools-Feature-Integration</p2.repo.virsat.id>
  <p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/integration/${build.version}/</p2.repo.virsat.url>
  <p2.repo.overtarget.id>Overtarget-Feature-Integration</p2.repo.overtarget.id>
@@ -103,8 +100,7 @@
  <build.qualifier>'r'yyyyMMddHHmm</build.qualifier>
  <maven.build.timestamp.format>'r'yyyyMMddHHmm</maven.build.timestamp.format>
  <build.folder.type>release/${build.version}/${env.GITHUB_SHA}</build.folder.type>
- <build.file.win32>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip</build.file.win32>
- <build.file.linux>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz</build.file.linux>
+ <build.file>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}</build.file>
  <p2.repo.virsat.id>DVLM-Tools-Feature-Release</p2.repo.virsat.id>
  <p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/24188989bef19563442734fd0bd66431ccff11b9</p2.repo.virsat.url>
  <p2.repo.overtarget.id>Overtarget-Feature-Release</p2.repo.overtarget.id>