Преглед изворни кода

Restrict backslash replacement in build-impl.xml

Restricts the replacement of backslashes in build-impl.xml
to only on the Windows platform. Improves issue 4048.

Change-Id: I99f17c527333d136d9fd00fe8850b37d8f53f7d9
Reviewed-on: http://gerrit.dmdirc.com/1159
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
tags/0.6.4rc1
Chris Northwood пре 14 година
родитељ
комит
dcf5072443
1 измењених фајлова са 9 додато и 4 уклоњено
  1. 9
    4
      nbproject/build-impl.xml

+ 9
- 4
nbproject/build-impl.xml Прегледај датотеку

@@ -34,17 +34,22 @@ is divided into following sections:
34 34
         <!-- Empty placeholder for easier customization. -->
35 35
         <!-- You can override this target in the ../build.xml file. -->
36 36
     </target>
37
-    <target depends="-pre-init" name="-init-private">
38
-        <property file="nbproject/private/config.properties"/>
39
-        <property file="nbproject/private/configs/${config}.properties"/>
40
-        <property file="nbproject/private/private.properties"/>
37
+    <condition property="is.windows"><os family="windows"/></condition>
38
+    <target name="-init-dynamic-properties">
41 39
 	<mkdir dir="nbproject/private/" />
42 40
 	<delete file="nbproject/private/dynamic.properties" />
43 41
         <echo file="nbproject/private/dynamic.properties" append="true"># DO NOT EDIT THIS FILE, IT WILL BE OVERWRITTEN BY ANT
44 42
 </echo>
45 43
         <echo file="nbproject/private/dynamic.properties" append="true">private.classpath=${toString:plugins.libs}
46 44
 </echo>
45
+    </target>
46
+    <target depends="-init-dynamic-properties" name="-init-dynamic-properties-windows" if="is.windows">
47 47
         <replace file="nbproject/private/dynamic.properties" token="\" value="/"/> <!-- this replaces backslashes with slashes on Windows -->
48
+    </target>
49
+    <target depends="-pre-init,-init-dynamic-properties,-init-dynamic-properties-windows" name="-init-private">
50
+        <property file="nbproject/private/config.properties"/>
51
+        <property file="nbproject/private/configs/${config}.properties"/>
52
+        <property file="nbproject/private/private.properties"/>
48 53
         <property file="nbproject/private/dynamic.properties"/>
49 54
     </target>
50 55
     <target depends="-pre-init,-init-private" name="-init-user">

Loading…
Откажи
Сачувај