[jsword-svn] r1299 - in trunk: bibledesktop bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop common jsword-support/tools/findbugs

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-04-27 03:44:04 -0700 (Fri, 27 Apr 2007)
New Revision: 1299

Modified:
   trunk/bibledesktop/build.xml
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
   trunk/common/core.xml
   trunk/jsword-support/tools/findbugs/build.xml
Log:
More Mac changes, fixing nightly build.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-04-25 21:57:08 UTC (rev 1298)
+++ trunk/bibledesktop/build.xml	2007-04-27 10:44:04 UTC (rev 1299)
@@ -36,6 +36,7 @@
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="bibledesktop-${release.version}.jar"/>
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-${release.version}.jar"/>
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-swing-${release.version}.jar"/>
+    <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-common-aqua-${release.version}.jar"/>
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="jsword-${release.version}.jar"/>
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-codec-1.3.jar"/>
     <jar.sign srcdir="${target.jar}" destdir="${target.signed}" jar="commons-httpclient-3.0.1.jar"/>

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2007-04-25 21:57:08 UTC (rev 1298)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2007-04-27 10:44:04 UTC (rev 1299)
@@ -1078,7 +1078,6 @@
             {
                 System.setProperty("apple.laf.useScreenMenuBar", "true"); //$NON-NLS-1$ //$NON-NLS-2$
                 System.setProperty("com.apple.mrj.application.apple.menu.about.name", Msg.getApplicationTitle()); //$NON-NLS-1$
-                System.setProperty("com.apple.mrj.application.growbox.intrudes", "true"); //$NON-NLS-1$ //$NON-NLS-2$
                 System.setProperty("com.apple.mrj.application.live-resize", "true"); //$NON-NLS-1$ //$NON-NLS-2$
             }
 

Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml	2007-04-25 21:57:08 UTC (rev 1298)
+++ trunk/common/core.xml	2007-04-27 10:44:04 UTC (rev 1299)
@@ -46,6 +46,7 @@
     <include name="**/lucene-*.jar"/>
     <include name="**/activation.jar"/>
     <include name="**/jlfgr-*.jar"/>
+    <include name="**/jsword-common-aqua-*.jar"/>
     <include name="**/rome-*.jar"/>
     <include name="**/xmlrpc-*.jar"/>
     <include name="**/gnu-regexp-*.jar"/>

Modified: trunk/jsword-support/tools/findbugs/build.xml
===================================================================
--- trunk/jsword-support/tools/findbugs/build.xml	2007-04-25 21:57:08 UTC (rev 1298)
+++ trunk/jsword-support/tools/findbugs/build.xml	2007-04-27 10:44:04 UTC (rev 1299)
@@ -27,6 +27,7 @@
       <class location="${target.jar}/jsword-${release.version}.jar"/>
       <class location="${target.jar}/jsword-common-${release.version}.jar"/>
       <class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
+      <class location="${target.jar}/jsword-common-aqua-${release.version}.jar"/>
       <auxClasspath path="${target.jar}/commons-net-1.4.1.jar"/>
       <auxClasspath path="${target.jar}/commons-httpclient-3.0.1.jar"/>
       <auxClasspath path="${target.jar}/commons-codec-1.3.jar"/>