Bladeren bron

Revert "Move licence file to correct place to be used for windows installer." licence file no longer needed

This reverts commit 722f4bb9af.

Change-Id: Ib341a8b510526bd6547542db049bd0c5062eff70
Reviewed-on: http://gerrit.dmdirc.com/1833
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.5b3
Greg Holmes 13 jaren geleden
bovenliggende
commit
22eb09de29
2 gewijzigde bestanden met toevoegingen van 0 en 7 verwijderingen
  1. 0
    4
      build-installer.xml
  2. 0
    3
      installer/windows/makeInstallerNSIS.sh

+ 0
- 4
build-installer.xml Bestand weergeven

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

+ 0
- 3
installer/windows/makeInstallerNSIS.sh Bestand weergeven

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"
49
 cd ../../modules/installer/windows/files
48
 cd ../../modules/installer/windows/files
50
 
49
 
51
 if [ "" != "${plugins}" ]; then
50
 if [ "" != "${plugins}" ]; then
71
 	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
70
 	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
72
 done
71
 done
73
 
72
 
74
-rm "license.txt"
75
-
76
 cd "${OLDDIR}"
73
 cd "${OLDDIR}"
77
 SRC="../../modules/installer/output/DMDirc-Setup.exe"
74
 SRC="../../modules/installer/output/DMDirc-Setup.exe"
78
 
75
 

Laden…
Annuleren
Opslaan