Procházet zdrojové kódy

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 před 13 roky
rodič
revize
22eb09de29
2 změnil soubory, kde provedl 0 přidání a 7 odebrání
  1. 0
    4
      build-installer.xml
  2. 0
    3
      installer/windows/makeInstallerNSIS.sh

+ 0
- 4
build-installer.xml Zobrazit soubor

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

+ 0
- 3
installer/windows/makeInstallerNSIS.sh Zobrazit soubor

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

Načítá se…
Zrušit
Uložit