Przeglądaj źródła

Move licence file to correct place to be used for windows installer.

Fixes CLIENT-183

Depends-On: Iff47e5dc648f44c03c16eb5c2e4053fba69b58dc
Change-Id: I3116ec7764e828c2d7bf9388d6498b39f5e2b3d3
Reviewed-on: http://gerrit.dmdirc.com/1811
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.5rc1
Greg Holmes 13 lat temu
rodzic
commit
722f4bb9af
2 zmienionych plików z 8 dodań i 0 usunięć
  1. 5
    0
      build-installer.xml
  2. 3
    0
      installer/windows/makeInstallerNSIS.sh

+ 5
- 0
build-installer.xml Wyświetl plik

82
        </exec>
82
        </exec>
83
 
83
 
84
         <mkdir dir="modules\installer\windows\files\" />
84
         <mkdir dir="modules\installer\windows\files\" />
85
+        <mkdir dir="modules\installer\output\" />
85
         <delete>
86
         <delete>
86
             <fileset dir="modules\installer\windows\files\" includes="*.*"/>
87
             <fileset dir="modules\installer\windows\files\" includes="*.*"/>
87
         </delete>
88
         </delete>
91
         <copy file="dist/DMDirc.jar"
92
         <copy file="dist/DMDirc.jar"
92
             tofile="modules\installer\windows\files\DMDirc.jar"
93
             tofile="modules\installer\windows\files\DMDirc.jar"
93
             overwrite="true" />
94
             overwrite="true" />
95
+        <copy file="src/com/dmdirc/licences/DMDirc - MIT"
96
+            tofile="modules\installer\windows\licence.txt"
97
+            overwrite="true" />
94
         <nsis script="modules\installer\windows\updater.nsi" verbosity="1">
98
         <nsis script="modules\installer\windows\updater.nsi" verbosity="1">
95
             <define name="VERSION" value="${version.git.nsis}"/>
99
             <define name="VERSION" value="${version.git.nsis}"/>
96
         </nsis>
100
         </nsis>
101
             <define name="VERSION" value="${version.git.nsis}"/>
105
             <define name="VERSION" value="${version.git.nsis}"/>
102
         </nsis>
106
         </nsis>
103
         <delete dir="modules\installer\windows\files" />
107
         <delete dir="modules\installer\windows\files" />
108
+        <delete file="modules\installer\windows\licence.txt" />
104
     </target>
109
     </target>
105
 
110
 
106
 </project>
111
 </project>

+ 3
- 0
installer/windows/makeInstallerNSIS.sh Wyświetl plik

45
 mkdir -p ../../modules/installer/windows/files
45
 mkdir -p ../../modules/installer/windows/files
46
 
46
 
47
 cp "${jarfile}" "../../modules/installer/windows/files/DMDirc.jar"
47
 cp "${jarfile}" "../../modules/installer/windows/files/DMDirc.jar"
48
+cp "../../src/com/dmdirc/licences/DMDirc - MIT" "../../modules/installer/windows/licence.txt"
48
 cd ../../modules/installer/windows/files
49
 cd ../../modules/installer/windows/files
49
 
50
 
50
 if [ "" != "${plugins}" ]; then
51
 if [ "" != "${plugins}" ]; then
70
 	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
71
 	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
71
 done
72
 done
72
 
73
 
74
+rm "license.txt"
75
+
73
 cd "${OLDDIR}"
76
 cd "${OLDDIR}"
74
 SRC="../../modules/installer/output/DMDirc-Setup.exe"
77
 SRC="../../modules/installer/output/DMDirc-Setup.exe"
75
 
78
 

Ładowanie…
Anuluj
Zapisz