M dist/netbeans/build.xml
- Correctly exclude Gtk test on Mac M dist/netbeans/logging.properties - turn on all webclient logging M dist/netbeans/webclient.properties - Use correct extension for jnilib on mac os x M webclient/src_moz/EmbedWindow.cpp M webclient/src_moz/NativeBrowserControl.cpp - extra logging M webclient/src_moz/WindowControlImpl.cpp - correct ifdef logic to exclude some Gtk specific code. git-svn-id: svn://10.0.0.236/trunk@227854 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
22
mozilla/java/dist/netbeans/build.xml
vendored
22
mozilla/java/dist/netbeans/build.xml
vendored
@@ -106,18 +106,18 @@
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="platform" value="unix">
|
||||
<and>
|
||||
<os family="unix" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="platform" value="mac">
|
||||
<and>
|
||||
<os family="mac" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="platform" value="unix">
|
||||
<and>
|
||||
<os family="unix" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="build.unix.classes">
|
||||
<and>
|
||||
<isset property="platform" />
|
||||
@@ -252,6 +252,11 @@ ${so.prefix}xul.${so.extension}.
|
||||
<compilerarg line="${javac.compilerargs}"/>
|
||||
<customize/>
|
||||
|
||||
<patternset>
|
||||
<exclude name="**/*Gtk*.java" if="build.mac.classes"/>
|
||||
<exclude name="**/*Win32*.java" if="build.mac.classes"/>
|
||||
</patternset>
|
||||
|
||||
<patternset>
|
||||
<exclude name="**/*Win32*.java" if="build.unix.classes"/>
|
||||
<exclude name="**/*Cocoa*.java" if="build.unix.classes"/>
|
||||
@@ -262,11 +267,6 @@ ${so.prefix}xul.${so.extension}.
|
||||
<exclude name="**/*Cocoa*.java" if="build.win32.classes"/>
|
||||
</patternset>
|
||||
|
||||
<patternset>
|
||||
<exclude name="**/*Gtk*.java" if="build.mac.classes"/>
|
||||
<exclude name="**/*Win32*.java" if="build.mac.classes"/>
|
||||
</patternset>
|
||||
|
||||
</javac>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
Reference in New Issue
Block a user