Skip to content

Commit 752cc16

Browse files
committed
moved icons to release/src
1 parent f036f5b commit 752cc16

34 files changed

Lines changed: 14 additions & 17 deletions

release/bundle-windows.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [[ -x "$WINE" ]]; then
5353
if [[ -f "$DIR/src/windows/Customer.ico" ]]; then
5454
cp "$DIR/src/windows/Customer.ico" "$SEVENZIP_DIR"
5555
else
56-
cp "$DIR/../share/icons/desktopshare.ico" "$SEVENZIP_DIR/Customer.ico"
56+
cp "$DIR/src/icons/desktopshare.ico" "$SEVENZIP_DIR/Customer.ico"
5757
fi
5858
"$WINE" "ResourceHacker.exe" -open "Customer.rc" -save "$SEVENZIP_DIR_WIN\Customer.res" -action compile
5959
"$WINE" "ResourceHacker.exe" -script "$SEVENZIP_DIR_WIN\Customer.script"
@@ -69,7 +69,7 @@ if [[ -x "$WINE" ]]; then
6969
if [[ -f "$DIR/src/windows/Staff.ico" ]]; then
7070
cp "$DIR/src/windows/Staff.ico" "$SEVENZIP_DIR"
7171
else
72-
cp "$DIR/../share/icons/help.ico" "$SEVENZIP_DIR/Staff.ico"
72+
cp "$DIR/src/icons/help.ico" "$SEVENZIP_DIR/Staff.ico"
7373
fi
7474
"$WINE" "ResourceHacker.exe" -open "Staff.rc" -save "$SEVENZIP_DIR_WIN\Staff.res" -action compile
7575
"$WINE" "ResourceHacker.exe" -script "$SEVENZIP_DIR_WIN\Staff.script"

release/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<stayAlive>true</stayAlive>
149149
<restartOnCrash>false</restartOnCrash>
150150
<manifest></manifest>
151-
<icon>${project.parent.basedir}/share/icons/desktopshare.ico</icon>
151+
<icon>${project.basedir}/src/icons/desktopshare.ico</icon>
152152
<singleInstance>
153153
<mutexName>StaffRemoteSupport</mutexName>
154154
<windowTitle>StaffRemoteSupport</windowTitle>
@@ -202,7 +202,7 @@
202202
<stayAlive>true</stayAlive>
203203
<restartOnCrash>false</restartOnCrash>
204204
<manifest></manifest>
205-
<icon>${project.parent.basedir}/share/icons/desktopshare.ico</icon>
205+
<icon>${project.basedir}/src/icons/desktopshare.ico</icon>
206206
<singleInstance>
207207
<mutexName>StaffRemoteSupport</mutexName>
208208
<windowTitle>StaffRemoteSupport</windowTitle>
@@ -256,7 +256,7 @@
256256
<stayAlive>true</stayAlive>
257257
<restartOnCrash>false</restartOnCrash>
258258
<manifest></manifest>
259-
<icon>${project.parent.basedir}/share/icons/help.ico</icon>
259+
<icon>${project.basedir}/src/icons/help.ico</icon>
260260
<singleInstance>
261261
<mutexName>CustomerRemoteSupport</mutexName>
262262
<windowTitle>CustomerRemoteSupport</windowTitle>
@@ -310,7 +310,7 @@
310310
<stayAlive>true</stayAlive>
311311
<restartOnCrash>false</restartOnCrash>
312312
<manifest></manifest>
313-
<icon>${project.parent.basedir}/share/icons/help.ico</icon>
313+
<icon>${project.basedir}/src/icons/help.ico</icon>
314314
<singleInstance>
315315
<mutexName>CustomerRemoteSupport</mutexName>
316316
<windowTitle>CustomerRemoteSupport</windowTitle>

release/src/assembly/customer-macos-x86-64.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<fileMode>0644</fileMode>
3535
</file>
3636
<file>
37-
<source>${project.parent.basedir}/share/icons/desktopshare.icns</source>
37+
<source>${project.basedir}/src/icons/desktopshare.icns</source>
3838
<destName>icon.icns</destName>
3939
<outputDirectory>share</outputDirectory>
4040
<fileMode>0644</fileMode>

release/src/assembly/staff-macos-x86-64.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<fileMode>0644</fileMode>
3535
</file>
3636
<file>
37-
<source>${project.parent.basedir}/share/icons/help.icns</source>
37+
<source>${project.basedir}/src/icons/help.icns</source>
3838
<destName>icon.icns</destName>
3939
<outputDirectory>share</outputDirectory>
4040
<fileMode>0644</fileMode>

release/src/icons/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This folder contains the icons used within this application.
2+
3+
The icons are taken from the *Crystal Project* icon set created by [Everaldo Coelho](https://www.everaldo.com/) and are licensed under the terms of [LGPL](https://web.archive.org/web/20101122171611/http://everaldo.com/crystal/?action=license).
4+
5+
Unfortunately the author does not provide the icons through his website anymore. But the full icon set is available at <https://github.com/pinhead84/crystal-project>.
File renamed without changes.

0 commit comments

Comments
 (0)