summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-05-05 15:22:25 +0200
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-05-05 15:22:25 +0200
commit7cc4ddc46867c23895c32c35b0ce53ce4f7401ba (patch)
treed055dd0915c9218e5de4d5b7a784f3ab135f6520
parent343e474baa3624f8968d2be3e10169e2244b0716 (diff)
downloadpdf-over-7cc4ddc46867c23895c32c35b0ce53ce4f7401ba.tar.gz
pdf-over-7cc4ddc46867c23895c32c35b0ce53ce4f7401ba.tar.bz2
pdf-over-7cc4ddc46867c23895c32c35b0ce53ce4f7401ba.zip
normalize line endings for WSL
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/customicons.xml16
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/install.xml156
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml64
3 files changed, 118 insertions, 118 deletions
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
index f877006c..5f5668fc 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
@@ -1,8 +1,8 @@
-<izpack:icons version="5.0"
- xmlns:izpack="http://izpack.org/schema/icons"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://izpack.org/schema/icons http://izpack.org/schema/5.0/izpack-icons-5.0.xsd">
-
- <icon res="/resources/JFrameIcon.png" id="JFrameIcon"/>
-
-</izpack:icons>
+<izpack:icons version="5.0"
+ xmlns:izpack="http://izpack.org/schema/icons"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/icons http://izpack.org/schema/5.0/izpack-icons-5.0.xsd">
+
+ <icon res="/resources/JFrameIcon.png" id="JFrameIcon"/>
+
+</izpack:icons>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/install.xml b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
index 943c3635..c6d45e9a 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<izpack:installation version="5.0"
- xmlns:izpack="http://izpack.org/schema/installation"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
-
- <info>
- <appname>PDF-Over</appname>
- <appversion>${project.version}</appversion>
- <javaversion>1.8</javaversion>
- <authors>
- <author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
- </authors>
- <url>http://www.a-sit.at/</url>
- <pack-compression-format>gz</pack-compression-format>
- </info>
-
- <guiprefs resizable="yes" width="700" height="360">
- <modifier key="useFlags" value="yes" />
- <modifier key="langDisplayType" value="native" />
- </guiprefs>
-
- <locale>
- <langpack iso3="eng" />
- <langpack iso3="deu" />
- </locale>
-
- <resources>
- <res id="shortcutSpec.xml" src="./unix_shortcutSpec.xml" />
- <res id="JFrameIcon.png" src="icon16x16.png" />
- <res id="customicons.xml" src="./customicons.xml" />
- <res id="Installer.image" src="a-sit-icon.png" />
- <res id="Installer.image.0" src="a-sit-icon.png" />
- </resources>
-
- <variables>
- <variable name="DesktopShortcutCheckboxEnabled" value="true" />
- </variables>
-
- <panels>
- <panel classname="HelloPanel" />
- <panel classname="TargetPanel" />
- <panel classname="InstallPanel" />
- <panel classname="ShortcutPanel" allowClose="true" />
- <panel classname="SimpleFinishPanel" />
- </panels>
-
- <natives> <!-- required to run installer on windows for debug -->
- <native type="izpack" name="ShellLink.dll"/>
- <native type="izpack" name="ShellLink_x64.dll"/>
- </natives>
-
- <packs>
- <pack name="main" required="yes">
- <description>Main Installation</description>
- <updatecheck>
- <include name="lib/**" />
- </updatecheck>
- <fileset dir="lib" targetdir="$INSTALL_PATH/lib" />
- <file src="${pdfover-build.bundled-jre.archive-filename}" targetdir="$INSTALL_PATH/jre" unpack="true">
- <archivefileset dir="${pdfover-build.bundled-jre.folder-in-archive}" />
- </file>
- <file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
- <file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
- <file src="icons" targetdir="$INSTALL_PATH" />
- <file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
-
- <!-- set executable bit, do not actually execute -->
- <executable targetfile="$INSTALL_PATH/pdf-over_linux.sh" stage="never" />
- <executable targetfile="$INSTALL_PATH/uninstall_linux.sh" stage="never" />
- <executable targetfile="$INSTALL_PATH/jre/bin/java" stage="never" />
- </pack>
- </packs>
-
-
-
-</izpack:installation>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<izpack:installation version="5.0"
+ xmlns:izpack="http://izpack.org/schema/installation"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
+
+ <info>
+ <appname>PDF-Over</appname>
+ <appversion>${project.version}</appversion>
+ <javaversion>1.8</javaversion>
+ <authors>
+ <author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
+ </authors>
+ <url>http://www.a-sit.at/</url>
+ <pack-compression-format>gz</pack-compression-format>
+ </info>
+
+ <guiprefs resizable="yes" width="700" height="360">
+ <modifier key="useFlags" value="yes" />
+ <modifier key="langDisplayType" value="native" />
+ </guiprefs>
+
+ <locale>
+ <langpack iso3="eng" />
+ <langpack iso3="deu" />
+ </locale>
+
+ <resources>
+ <res id="shortcutSpec.xml" src="./unix_shortcutSpec.xml" />
+ <res id="JFrameIcon.png" src="icon16x16.png" />
+ <res id="customicons.xml" src="./customicons.xml" />
+ <res id="Installer.image" src="a-sit-icon.png" />
+ <res id="Installer.image.0" src="a-sit-icon.png" />
+ </resources>
+
+ <variables>
+ <variable name="DesktopShortcutCheckboxEnabled" value="true" />
+ </variables>
+
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" allowClose="true" />
+ <panel classname="SimpleFinishPanel" />
+ </panels>
+
+ <natives> <!-- required to run installer on windows for debug -->
+ <native type="izpack" name="ShellLink.dll"/>
+ <native type="izpack" name="ShellLink_x64.dll"/>
+ </natives>
+
+ <packs>
+ <pack name="main" required="yes">
+ <description>Main Installation</description>
+ <updatecheck>
+ <include name="lib/**" />
+ </updatecheck>
+ <fileset dir="lib" targetdir="$INSTALL_PATH/lib" />
+ <file src="${pdfover-build.bundled-jre.archive-filename}" targetdir="$INSTALL_PATH/jre" unpack="true">
+ <archivefileset dir="${pdfover-build.bundled-jre.folder-in-archive}" />
+ </file>
+ <file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
+ <file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
+ <file src="icons" targetdir="$INSTALL_PATH" />
+ <file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
+
+ <!-- set executable bit, do not actually execute -->
+ <executable targetfile="$INSTALL_PATH/pdf-over_linux.sh" stage="never" />
+ <executable targetfile="$INSTALL_PATH/uninstall_linux.sh" stage="never" />
+ <executable targetfile="$INSTALL_PATH/jre/bin/java" stage="never" />
+ </pack>
+ </packs>
+
+
+
+</izpack:installation>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
index 5117a03e..9824626a 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<izpack:shortcuts version="5.0"
- xmlns:izpack="http://izpack.org/schema/shortcuts"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://izpack.org/schema/shortcuts http://izpack.org/schema/5.0/izpack-shortcuts-5.0.xsd">
- <!-- <skipIfNotSupported/> -->
- <programGroup defaultName="PDF-Over"
- location="applications"/>
-
- <shortcut
- name="PDF-Over"
- programGroup="yes"
- desktop="yes"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH/pdf-over_linux.sh"
- commandLine=""
- workingDirectory="$INSTALL_PATH"
- description="PDF-Over ${project.version}"
- iconFile="$INSTALL_PATH/icons/icon.png"
- iconIndex="0"
- type="Application"
- encoding="UTF-8"
- terminal="false"
- KdeSubstUID="false"
- initialState="normal">
- <createForPack name="main"/>
- </shortcut>
-
-</izpack:shortcuts>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<izpack:shortcuts version="5.0"
+ xmlns:izpack="http://izpack.org/schema/shortcuts"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/shortcuts http://izpack.org/schema/5.0/izpack-shortcuts-5.0.xsd">
+ <!-- <skipIfNotSupported/> -->
+ <programGroup defaultName="PDF-Over"
+ location="applications"/>
+
+ <shortcut
+ name="PDF-Over"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$INSTALL_PATH/pdf-over_linux.sh"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ description="PDF-Over ${project.version}"
+ iconFile="$INSTALL_PATH/icons/icon.png"
+ iconIndex="0"
+ type="Application"
+ encoding="UTF-8"
+ terminal="false"
+ KdeSubstUID="false"
+ initialState="normal">
+ <createForPack name="main"/>
+ </shortcut>
+
+</izpack:shortcuts>