[jsword-svn] r2288 - in trunk: bibledesktop bibledesktop/etc/eclipse bibledesktop/etc/installer/win32 bibledesktop/etc/license bibledesktop/src bibledesktop/src/main/java/org/crosswire/bibledesktop/display bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic bibledesktop-web bibledesktop-web/etc/eclipse jsword-web jsword-web/etc/eclipse jsword-web/src
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Mar 9 17:32:41 MST 2013
Author: dmsmith
Date: 2013-03-09 17:32:41 -0700 (Sat, 09 Mar 2013)
New Revision: 2288
Added:
trunk/bibledesktop/etc/license/gpl.txt
Removed:
trunk/bibledesktop/etc/installer/win32/gpl.txt
trunk/bibledesktop/src/test/
trunk/jsword-web/src/test/
Modified:
trunk/bibledesktop-web/build.xml
trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
trunk/jsword-web/build.xml
trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
Log:
build improvements
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/build.xml 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,171 +1,224 @@
<project name="bibledesktop" default="all">
- <!-- This build uses the core build targets -->
- <import file="../jsword/core.xml"/>
- <property name="dependency" value="jsword"/>
+ <!-- This build uses the core build targets -->
+ <import file="../jsword/core.xml"/>
+ <property name="dependency" value="jsword"/>
- <!--=======================================================================-->
- <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/> <!-- override -->
- <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.dir}"/> <!-- override -->
+ <!--=======================================================================-->
+ <!-- override -->
+ <property name="jnlp.homepage" value="file:///${basedir}/${dest.install.dir}"/>
+ <!-- override -->
+ <property name="jnlp.codebase" value="file:///${basedir}/${dest.install.dir}"/>
- <property name="gener.root" value="${dest.dir}/gener"/>
+ <property name="gener.root" value="${dest.dir}/gener"/>
- <property name="support.tools" value="../jsword-support/tools"/>
- <!--<import file="${support.tools}/nsis/build.xml"/>-->
+ <target name="prepare"
+ description="Prepare the build by copying needed jars and files">
+ <copy verbose="${verbose.copy}"
+ todir="${lib.dir}"
+ flatten="true"
+ preservelastmodified="true">
+ <fileset dir="jar" includes="**/*.jar"/>
+ </copy>
+ </target>
- <!--=======================================================================-->
- <target name="compile.test.extra">
- <mkdir dir="${gener.root}/config"/>
- <xslt
- in="${src.main.res.dir}/config.xml"
- out="${gener.root}/config/Configsrc.test.java.dir"
- style="../jsword/etc/config-test.xsl">
- <xmlcatalog refid="commonDTDs"/>
- </xslt>
- <javac debug="on" includes="**/*.java" destdir="${test.classes}">
- <src path="${gener.root}/config"/>
- <classpath refid="classpath.test"/>
- </javac>
- <xmlcatalog refid="commonDTDs"/>
- </target>
+ <!--=======================================================================-->
+ <target name="compile.test.extra.dont.do">
+ <mkdir dir="${gener.root}/config"/>
+ <xslt in="${src.main.res.dir}/config.xml"
+ out="${gener.root}/config/Configsrc.test.java.dir"
+ style="${jsword.home}/${etc.dir}/config-test.xsl">
+ <xmlcatalog refid="commonDTDs"/>
+ </xslt>
+ <javac debug="on"
+ includes="**/*.java"
+ destdir="${dest.test.classes.dir}"
+ includeantruntime="false"
+ source="1.5">
+ <src path="${gener.root}/config"/>
+ <classpath refid="classpath.test"/>
+ </javac>
+ <xmlcatalog refid="commonDTDs"/>
+ </target>
- <!--=======================================================================-->
- <target name="install"
- depends="build, keygen, install.check"
- unless="install.uptodate"
- description="Prepares for web based jnlp deploy">
+ <!--=======================================================================-->
+ <target name="package">
- <echo message="Building distribution: installed files in: ${dest.install.dir}"/>
+ <echo message="Building distribution: installed files in: ${dest.install.dir}"/>
- <!-- Create the installation directory -->
- <mkdir dir="${dest.install.dir}"/>
+ <!-- Create the installation directory -->
+ <mkdir dir="${dest.install.dir}"/>
- <!--
- == Prepare the Mac distribution as a zip file.
- -->
- <copy verbose="${verbose.copy}"
- file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
- toFile="${dest.install.dir}/Info.plist"
- preservelastmodified="true">
- <filterset>
- <filter token="release.version" value="${release.version}"/>
- </filterset>
- </copy>
+ <antcall target="package.linux"/>
+ <antcall target="package.webstart"/>
+ <antcall target="package.macosx"/>
+ <antcall target="package.windows"/>
+ </target>
- <zip destfile="${dest.install.dir}/BibleDesktop.app.zip" update="true">
- <!-- Copy everything but the executable (zip will not preserve permissions)
- == And Info.plist, which needs to be filtered.
- -->
- <zipfileset prefix="BibleDesktop.app"
- dir="${etc.dir}/installer/macosx/BibleDesktop.app">
- <exclude name="**/*JavaApplicationStub*"/>
- <exclude name="**/*Info.plist"/>
- </zipfileset>
- <!-- Copy the executable and set the right permissions -->
- <zipfileset prefix="BibleDesktop.app/Contents/MacOS"
- filemode="755"
- file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
- <!-- Copy the filtered Info.plist file -->
- <zipfileset prefix="BibleDesktop.app/Contents"
- file="${dest.install.dir}/Info.plist"/>
- <!-- Add in all the unsigned jars -->
- <zipfileset prefix="BibleDesktop.app/Contents/Resources/Java"
- dir="${target.jar}">
- <patternset refid="internal.built.jars"/>
- <patternset refid="patternset.runtime"/>
- </zipfileset>
- </zip>
- <delete file="${dest.install.dir}/Info.plist"/>
+ <!-- Package the command-line distribution -->
+ <target name="package.linux">
+ <property name="name.versioned" value="${ant.project.name}-${release.version}"/>
+ <property name="name.timestamped" value="${dest.install.dir}/${name.versioned}-${today}"/>
- <!-- sign the jars in place -->
- <signjar
- storepass="${keystore.pswd}"
- alias="${keystore.alias}"
- keystore="${keystore.file}"
- preservelastmodified="true"
- lazy="true">
- <path refid="classpath.runtime"/>
- </signjar>
+ <!-- Ensure sane execute permissions -->
+ <chmod perm="a+x">
+ <fileset dir="${etc.dir}/bin" includes="*.sh"/>
+ </chmod>
- <!-- Create a flag file used to determine whether the set of jars needs to be signed -->
- <touch file="${dest.dir}/.flagfile"/>
+ <!-- Ensure that line endings are consistent with un*x platform -->
+ <fixcrlf srcdir="${etc.dir}/bin" eol="lf">
+ <include name="*.sh"/>
+ </fixcrlf>
- <!-- Copy the files needed for the distribution -->
- <copy verbose="${verbose.copy}"
- todir="${dest.install.dir}"
- preservelastmodified="true">
- <fileset dir="${etc.dir}/jnlp">
- <include name="*.gif"/>
- </fileset>
- <fileset dir="${etc.dir}/bin"/>
- <fileset dir="${etc.dir}/installer">
- <include name="bibledesktop.exe"/>
- </fileset>
- </copy>
+ <!-- Ensure that line endings are consistent with the windows platform -->
+ <fixcrlf srcdir="${etc.dir}/bin" eol="crlf">
+ <include name="*.bat"/>
+ </fixcrlf>
- <!-- Copy and filter to make it work -->
- <copy verbose="${verbose.copy}"
- file="${etc.dir}/jnlp/bibledesktop.jnlp"
- tofile="${dest.install.dir}/bibledesktop.jnlp"
- filtering="true"
- preservelastmodified="true">
- <filterset>
- <filter token="jnlp.homepage" value="${jnlp.homepage}"/>
- <filter token="jnlp.codebase" value="${jnlp.codebase}"/>
- <filter token="release.version" value="${release.version}"/>
- </filterset>
- </copy>
+ <!-- create a zip file -->
+ <zip zipfile="${name.timestamped}-bin.zip">
+ <zipfileset prefix="${name.versioned}" dir="${lib.dir}">
+ <patternset refid="patternset.runtime"/>
+ </zipfileset>
+ <zipfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.sh" filemode="755"/>
+ <zipfileset prefix="${name.versioned}" dir="${etc.dir}/bin" includes="*.bat"/>
+ <zipfileset prefix="${name.versioned}" dir="${etc.dir}/installer/win32" includes="BibleDesktop.exe"/>
+ <zipfileset prefix="${name.versioned}" dir="${etc.dir}/images" includes="*.png"/>
+ <zipfileset prefix="${name.versioned}" file="${etc.dir}/license/gpl.txt"/>
+ </zip>
+ <symlink
+ link="${dest.install.dir}/${ant.project.name}-latest-bin.zip"
+ resource="${name.timestamped}-bin.zip"
+ overwrite="true"
+ failonerror="false"/>
- <!-- copy does not preserve file permissions, so we reset them -->
- <chmod perm="a+x">
- <fileset dir="${dest.install.dir}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
- <!-- Ensure that line endings are consistent with their target platform -->
- <fixcrlf srcdir="${dest.install.dir}" eol="lf">
- <include name="**/*.sh"/>
- </fixcrlf>
- <fixcrlf srcdir="${dest.install.dir}" eol="crlf">
- <include name="**/*.bat"/>
- </fixcrlf>
+ <!-- Convert the zip into a tar.gz -->
+ <tar tarfile="${name.timestamped}-bin.tar.gz" compression="gzip">
+ <zipfileset src="${name.timestamped}-bin.zip"/>
+ </tar>
+ <symlink
+ link="${dest.install.dir}/${ant.project.name}-latest-bin.tar.gz"
+ resource="${name.timestamped}-bin.tar.gz"
+ overwrite="true"
+ failonerror="false"/>
+ </target>
- <!-- Build the Windows installers from the installed/signed jars -->
- <copy verbose="${verbose.copy}"
- todir="${dest.install.dir}"
- filtering="true"
- preservelastmodified="true">
- <fileset dir="${etc.dir}/installer/win32">
- <include name="*.nsi"/>
- </fileset>
- <filterset>
- <filter token="release.version" value="${release.version}"/>
- </filterset>
- </copy>
- <copy verbose="${verbose.copy}"
- todir="${dest.install.dir}"
- preservelastmodified="true">
- <fileset dir="${etc.dir}/installer/win32">
- <include name="*.ico"/>
- <include name="gpl.txt"/>
- </fileset>
- </copy>
- <!--
- <nsis verbosity="1" script="${dest.install.dir}/BibleDesktop.nsi"/>
- <nsis verbosity="1" script="${dest.install.dir}/PortableBibleDesktop.nsi"/>
- <nsis verbosity="1" script="${dest.install.dir}/BibleDesktopSetup.nsi"/>
- <delete file="${dest.install.dir}/BibleDesktop.nsi"/>
- <delete file="${dest.install.dir}/PortableBibleDesktop.nsi"/>
- <delete file="${dest.install.dir}/BibleDesktopSetup.nsi"/>
- -->
- </target>
+ <!-- Prepare the WebStart distribution -->
+ <target name="package.webstart">
+ <property name="dest.install.webstart.dir" value="${dest.install.dir}/webstart"/>
- <target name="install.check">
- <uptodate property="install.uptodate"
- targetfile="${dest.dir}/.flagfile">
- <srcfiles dir="${target.jar}"/>
- </uptodate>
- <echo message="install.uptodate result: ${install.uptodate}"/>
- </target>
+ <!-- Copy the files needed for the distribution -->
+ <copy verbose="${verbose.copy}"
+ todir="${dest.install.webstart.dir}"
+ preservelastmodified="true">
+ <fileset dir="${etc.dir}/jnlp">
+ <include name="*.gif"/>
+ </fileset>
+ </copy>
+ <!-- Put signed copies of the jars where Webstart can get them. -->
+ <signjar
+ destDir="${dest.install.webstart.dir}"
+ storepass="${keystore.pswd}"
+ alias="${keystore.alias}"
+ keystore="${keystore.file}"
+ preservelastmodified="true"
+ lazy="true">
+ <path refid="classpath.runtime"/>
+ </signjar>
+
+ <!-- Copy and filter to make it work -->
+ <copy verbose="${verbose.copy}"
+ file="${etc.dir}/jnlp/bibledesktop.jnlp"
+ tofile="${dest.install.webstart.dir}/bibledesktop.jnlp"
+ filtering="true"
+ preservelastmodified="true">
+ <filterset>
+ <filter token="jnlp.homepage" value="${jnlp.homepage}"/>
+ <filter token="jnlp.codebase" value="${jnlp.codebase}"/>
+ <filter token="release.version" value="${release.version}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- Prepare the Mac distribution as a zip file. -->
+ <target name="package.macosx">
+ <copy verbose="${verbose.copy}"
+ file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
+ toFile="${dest.install.dir}/Info.plist"
+ preservelastmodified="true">
+ <filterset>
+ <filter token="release.version" value="${release.version}"/>
+ </filterset>
+ </copy>
+
+ <zip destfile="${dest.install.dir}/BibleDesktop.app.zip" update="true">
+ <!-- Copy everything but the executable (zip will not preserve permissions)
+ == And Info.plist, which needs to be filtered.
+ -->
+ <zipfileset
+ prefix="BibleDesktop.app"
+ dir="${etc.dir}/installer/macosx/BibleDesktop.app">
+ <exclude name="**/*JavaApplicationStub*"/>
+ <exclude name="**/*Info.plist"/>
+ </zipfileset>
+ <!-- Copy the executable and set the right permissions -->
+ <zipfileset
+ prefix="BibleDesktop.app/Contents/MacOS"
+ filemode="755"
+ file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+ <!-- Copy the filtered Info.plist file -->
+ <zipfileset
+ prefix="BibleDesktop.app/Contents"
+ file="${dest.install.dir}/Info.plist"/>
+ <!-- Add in all the unsigned jars -->
+ <zipfileset
+ prefix="BibleDesktop.app/Contents/Resources/Java"
+ dir="${lib.dir}">
+ <patternset refid="patternset.runtime"/>
+ </zipfileset>
+ </zip>
+ <delete file="${dest.install.dir}/Info.plist"/>
+ </target>
+
+ <!-- Build the Windows installers from the installed/signed jars -->
+ <target name="package.windows">
+ <!-- Copy the files needed for the distribution -->
+ <copy verbose="${verbose.copy}"
+ todir="${dest.install.dir}"
+ preservelastmodified="true">
+ <fileset dir="${etc.dir}/bin" includes="*.bat"/>
+ <fileset dir="${etc.dir}/installer/win32">
+ <include name="*.ico"/>
+ <include name="gpl.txt"/>
+ <include name="BibleDesktop.exe"/>
+ </fileset>
+ </copy>
+
+ <!-- Ensure that line endings are consistent with the windows platform -->
+ <fixcrlf srcdir="${dest.install.dir}" eol="crlf">
+ <include name="**/*.bat"/>
+ </fixcrlf>
+
+ <copy verbose="${verbose.copy}"
+ todir="${dest.install.dir}"
+ preservelastmodified="true"
+ filtering="true">
+ <fileset dir="${etc.dir}/installer/win32">
+ <include name="*.nsi"/>
+ </fileset>
+ <filterset>
+ <filter token="release.version" value="${release.version}"/>
+ </filterset>
+ </copy>
+ <!--
+ <nsis verbosity="1" script="${dest.install.dir}/BibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.dir}/PortableBibleDesktop.nsi"/>
+ <nsis verbosity="1" script="${dest.install.dir}/BibleDesktopSetup.nsi"/>
+ -->
+ <delete file="${dest.install.dir}/BibleDesktop.nsi"/>
+ <delete file="${dest.install.dir}/PortableBibleDesktop.nsi"/>
+ <delete file="${dest.install.dir}/BibleDesktopSetup.nsi"/>
+ </target>
+
</project>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -12,7 +12,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
Deleted: trunk/bibledesktop/etc/installer/win32/gpl.txt
===================================================================
--- trunk/bibledesktop/etc/installer/win32/gpl.txt 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/etc/installer/win32/gpl.txt 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Copied: trunk/bibledesktop/etc/license/gpl.txt (from rev 2284, trunk/bibledesktop/etc/installer/win32/gpl.txt)
===================================================================
--- trunk/bibledesktop/etc/license/gpl.txt (rev 0)
+++ trunk/bibledesktop/etc/license/gpl.txt 2013-03-10 00:32:41 UTC (rev 2288)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java 2013-03-10 00:32:41 UTC (rev 2288)
@@ -24,7 +24,7 @@
import java.util.EventListener;
/**
- * Implement URIEventListener to recieve URIEvents whenever someone activates an
+ * Implement URIEventListener to receive URIEvents whenever someone activates an
* URI.
*
* @see gnu.gpl.License for license details.<br>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2013-03-10 00:32:41 UTC (rev 2288)
@@ -30,6 +30,7 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
import java.net.URI;
import java.util.Locale;
@@ -80,7 +81,7 @@
* The copyright to this program is held by it's authors.
* @author Yingjie Lan [lanyjie at yahoo dot com]
*/
-public class URITipMgr extends MouseAdapter implements ActionListener, URIEventListener {
+public class URITipMgr extends MouseAdapter implements ActionListener, URIEventListener, MouseMotionListener {
private Component owner;
private JTextPane txtView;
@@ -319,17 +320,15 @@
timer.stop();
}
- /* (non-Javadoc)
- * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
+ /**
+ * @param e
*/
- @Override
public void mouseDragged(MouseEvent e) {
}
/* (non-Javadoc)
* @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
*/
- @Override
public void mouseMoved(MouseEvent e) {
lastx = e.getX();
lasty = e.getY();
Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop-web/build.xml 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,54 +1,55 @@
<project name="jsword-web" default="all">
- <import file="../jsword/core.xml"/>
- <property name="dependency" value="bibledesktop"/>
- <property name="dependency.install" value="../${dependency}/${dest.dir}/${dependency}"/>
+ <import file="../jsword/core.xml"/>
+ <property name="dependency" value="bibledesktop"/>
- <!--=======================================================================-->
- <property name="source.web" value="${src.dir}/main/webapp"/>
- <property name="webapp.bibledesktop" value="${dest.dir}/webapp"/> <!-- override -->
+ <!--=======================================================================-->
+ <property name="webapp.bibledesktop" value="${dest.install.web.dir}"/> <!-- override -->
- <!--=======================================================================-->
- <target name="webapp" description="Build an unpacked war file">
- <mkdir dir="${webapp.bibledesktop}"/>
- <xslt basedir="${source.web}" extension=".html" style="${source.web}/template.xsl" destdir="${webapp.bibledesktop}">
- <outputproperty name="method" value="html"/>
- <outputproperty name="omit-xml-declaration" value="yes"/>
- <include name="**/*.html"/>
- <xmlcatalog refid="commonDTDs"/>
- </xslt>
- <copy todir="${webapp.bibledesktop}">
- <fileset dir="${source.web}">
- <exclude name="*.jsp"/>
- <exclude name="*.html"/>
- <exclude name="*.xsl"/>
- </fileset>
- </copy>
- <mkdir dir="${webapp.bibledesktop}/WEB-INF/classes"/>
- <mkdir dir="${webapp.bibledesktop}/WEB-INF/lib"/>
- </target>
+ <!--=======================================================================-->
+ <target name="webapp" description="Build an unpacked war file">
+ <mkdir dir="${webapp.bibledesktop}" />
+ <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${webapp.bibledesktop}">
+ <outputproperty name="method" value="html" />
+ <outputproperty name="omit-xml-declaration" value="yes" />
+ <include name="**/*.html" />
+ <xmlcatalog refid="commonDTDs" />
+ </xslt>
+ <copy todir="${webapp.bibledesktop}">
+ <fileset dir="${src.main.web.dir}">
+ <exclude name="*.jsp" />
+ <exclude name="*.html" />
+ <exclude name="*.xsl" />
+ </fileset>
+ </copy>
+ <mkdir dir="${webapp.bibledesktop}/WEB-INF/classes" />
+ <mkdir dir="${webapp.bibledesktop}/WEB-INF/lib" />
+ </target>
- <!--=======================================================================-->
- <target name="install" depends="install.dependency, webapp" description="Install all the files" >
- </target>
+ <!--=======================================================================-->
+ <target name="install" depends="webapp" description="Install all the files" >
+ </target>
- <!--=======================================================================
- == Override targets that should do nothing
- =======================================================================-->
- <!-- It is necessary to build and prepare the dependencies -->
- <target name="prepare" description="Prepare the build by copying needed jars and files">
- <!-- There are no jars to copy -->
- </target>
+ <!--=======================================================================
+ == Override targets that should do nothing
+ =======================================================================-->
+ <target name="prepare"
+ description="Prepare the build by copying needed jars and files">
+ <!-- There are no jars to copy -->
+ </target>
- <target name="build"
- depends="build.dependency"
- description="Run a full build">
- <!-- There is nothing to build -->
- </target>
+ <target name="build"
+ description="Run a full build">
+ <!-- There is nothing to build -->
+ </target>
- <target name="compile.test"
- description="Compile the test source">
- <!-- There is no test code build -->
- </target>
+ <target name="test"
+ description="Run test cases">
+ <!-- There is no test code build -->
+ </target>
+ <target name="tools"
+ description="Run QA reports">
+ <!-- There is nothing to look at -->
+ </target>
</project>
Modified: trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
===================================================================
--- trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop-web/build.xml"/>
</listAttribute>
@@ -12,7 +12,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:bibledesktop-web}"/>
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/jsword-web/build.xml 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,16 +1,11 @@
<project name="jsword-web" default="all">
- <property name="dest.install.dir" value="../bibledesktop/target/installed"/>
- <!-- override -->
-
<import file="../jsword/core.xml"/>
<property name="dependency" value="bibledesktop-web"/>
<!--=======================================================================-->
- <property name="source.web" value="${src.dir}/main/webapp"/>
-
- <property name="webapp.jsword" value="${dest.dir}/webapp"/>
+ <property name="webapp.jsword" value="${dest.install.web.dir}"/>
<!-- override -->
<property name="jnlp.hostname" value="localhost:8080"/>
<!-- override -->
@@ -19,7 +14,6 @@
<property name="ftp.prefix" value="../download"/>
<!-- override -->
- <property name="nightly.dir" value="${ftp.base}/nightly"/>
<property name="release.dir" value="${ftp.base}/release"/>
<property name="target.web" value="${webapp.jsword}"/>
@@ -34,110 +28,38 @@
<include name="bibledesktop/src/main/java/**/*.java"/>
<include name="jsword-web/src/main/java/**/*.java"/>
</patternset>
- <fileset id="fileset.alljava" dir="..">
- <patternset refid="pattern.alljava"/>
- </fileset>
- <path id="path.allclasses">
- <pathelement path="../common-swing/${dest.main.classes.dir}"/>
- <pathelement path="../jsword/${dest.main.classes.dir}"/>
- <pathelement path="../bibledesktop/${dest.main.classes.dir}"/>
- <pathelement path="../jsword-web/${dest.main.classes.dir}"/>
- </path>
- <property name="support.tools" value="../jsword-support/tools"/>
- <import file="${support.tools}/java2html/build.xml"/>
- <import file="${support.tools}/javancss/build.xml"/>
- <import file="${support.tools}/jcoverage/build.xml"/>
-
- <target name="findbugs" depends="build,findbugs.task">
- <mkdir dir="${target.web}/findbugs"/>
- <findbugs home="${findbugs.home}"
- projectName="JSword/BibleDesktop"
- output="html"
- outputFile="${target.web}/findbugs/index.html"
- reportLevel="low"
- workHard="true"
- jvmargs="-Xmx512m">
- <class location="${target.jar}/bibledesktop-${release.version}.jar"/>
- <class location="${target.jar}/jsword-${release.version}.jar"/>
- <class location="${target.jar}/jsword-common-swing-${release.version}.jar"/>
- <sourcePath>
- <dirset dir=".." includes="**/${src.main.java.dir}"/>
- </sourcePath>
- <auxClasspath>
- <fileset dir="${target.jar}" includes="*.jar" />
- </auxClasspath>
- </findbugs>
+ <!--=======================================================================
+ == Override targets that should do nothing
+ =======================================================================-->
+ <target name="prepare"
+ description="Prepare the build by copying needed jars and files">
+ <!-- There are no jars to copy -->
</target>
- <target name="checkstyle" depends="checkstyle.task">
- <mkdir dir="${target.web}/checkstyle"/>
- <checkstyle config="${checkstyle.config}" failOnViolation="${checkstyle.fail}">
- <property key="checkstyle.basedir" file="${src.main.java.dir}" />
- <property key="checkstyle.cache.file" file="${dest.dir}/checkstyle.cache.dat" />
- <fileset refid="fileset.alljava" />
- <formatter type="plain" />
- <formatter type="xml" toFile="${target.web}/checkstyle/checkstyle_errors.xml" />
- </checkstyle>
- <xslt in="${target.web}/checkstyle/checkstyle_errors.xml" out="${target.web}/checkstyle/index.html" style="${checkstyle.home}/contrib/checkstyle-simple.xsl">
- <xmlcatalog refid="commonDTDs"/>
- </xslt>
+ <target name="build"
+ description="Run a full build">
+ <!-- There is nothing to build -->
</target>
- <target name="javadoc" description="Create JavaDoc">
- <!-- This is not incremental. Empty it so it can remove unused docs. -->
- <delete dir="${target.web}/api"/>
- <mkdir dir="${target.web}/api"/>
- <javadoc
- sourcepathref="path.alljava"
- packagenames="org.crosswire.*,gnu.gpl.*,gnu.lgpl.*"
- classpathref="classpath.runtime"
- stylesheetfile="${etc.dir}/javadoc/stylesheet.css"
- destdir="${target.web}/api"
- overview="../jsword/src/main/java/overview.html"
- private="true"
- author="true"
- use="true"
- splitindex="true"
- version="true"
- source="1.5"
- failonerror="false">
- <footer>Copyright ¨ 2003-2013</footer>
- <link offline="true" href="http://download.oracle.com/javase/1.5.0/docs/api/" packagelistLoc="${etc.dir}/javadoc"/>
- </javadoc>
+ <target name="test"
+ description="Run test cases">
+ <!-- There is no test code build -->
</target>
- <!--=======================================================================-->
- <target name="tools" depends="java2html,javancss"/>
-
- <!--=======================================================================-->
- <target name="install"
- depends="install.dependency, install.check"
- unless="release.uptodate"
- description="Install all the files">
- <antcall target="do.install"/>
+ <target name="tools"
+ description="Run QA reports">
+ <!-- There is nothing to look at -->
</target>
- <target name="do.install"
- depends="webapp, tools, release.nightly">
- <!-- Create a flag file used to determine whether this task finished successfully -->
- <touch file="${dest.dir}/.flagfile"/>
- </target>
- <target name="install.check">
- <uptodate property="release.uptodate"
- targetfile="${dest.dir}/.flagfile">
- <srcfiles dir="${target.jar}" includes="*"/>
- </uptodate>
- <echo message="release.uptodate result: ${release.uptodate}"/>
- </target>
<!--=======================================================================-->
- <target name="webapp" description="Build an unpacked war file">
+ <target name="package" description="Build an unpacked war file">
<mkdir dir="${target.web}"/>
- <xslt basedir="${source.web}" extension=".html" style="${source.web}/template.xsl" destdir="${target.web}">
+ <xslt basedir="${src.main.web.dir}" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${target.web}">
<include name="**/*.html"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
- <xslt basedir="${source.web}" extension=".jsp" style="${source.web}/template.xsl" destdir="${target.web}">
+ <xslt basedir="${src.main.web.dir}" extension=".jsp" style="${src.main.web.dir}/template.xsl" destdir="${target.web}">
<include name="*.jsp"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
@@ -147,10 +69,10 @@
<filter token="ftp.base" value="${ftp.base}"/>
<filter token="ftp.prefix" value="${ftp.prefix}"/>
</filterset>
- <fileset dir="${source.web}/WEB-INF"/>
+ <fileset dir="${src.main.web.dir}/WEB-INF"/>
</copy>
<copy todir="${target.web}">
- <fileset dir="${source.web}">
+ <fileset dir="${src.main.web.dir}">
<exclude name="*.jsp"/>
<exclude name="*.html"/>
<exclude name="*.xsl"/>
@@ -160,28 +82,28 @@
<mkdir dir="${target.web}/WEB-INF/classes"/>
<mkdir dir="${target.web}/WEB-INF/lib"/>
<copy todir="${target.web}/WEB-INF/lib">
- <fileset dir="${target.jar}" includes="*.jar"/>
+ <fileset dir="${lib.dir}" includes="*.jar"/>
</copy>
<!-- needed by the download servlet -->
- <mkdir dir="${nightly.dir}"/>
+ <mkdir dir="${dest.install.dir}"/>
<mkdir dir="${release.dir}"/>
<!-- build the iBD servlet -->
- <xslt basedir="${source.web}/iBD" extension=".html" style="${source.web}/template.xsl" destdir="${target.web}">
+ <xslt basedir="${src.main.web.dir}/iBD" extension=".html" style="${src.main.web.dir}/template.xsl" destdir="${target.web}">
<include name="**/tutorial.html"/>
<xmlcatalog refid="commonDTDs"/>
</xslt>
<copy todir="${target.web}/WEB-INF">
- <fileset dir="${source.web}/iBD/WEB-INF">
+ <fileset dir="${src.main.web.dir}/iBD/WEB-INF">
<!-- This is what it would be if it were a stand-alone servlet -->
<!-- But we have included a different web.xml with this already defined -->
<exclude name="web.xml"/>
</fileset>
</copy>
<copy todir="${target.web}/WEB-INF/lib">
- <fileset dir="${source.web}/iBD/WEB-INF/lib" includes="*.jar"/>
+ <fileset dir="${src.main.web.dir}/iBD/WEB-INF/lib" includes="*.jar"/>
</copy>
<copy todir="${target.web}">
- <fileset dir="${source.web}/iBD">
+ <fileset dir="${src.main.web.dir}/iBD">
<include name="*.js"/>
<include name="iBD.*"/>
<exclude name="WEB-INF/**"/>
@@ -189,71 +111,4 @@
</copy>
</target>
-
- <!--=======================================================================-->
- <target name="release.nightly" description="Build a nightly release fileset">
- <tstamp>
- <format property="today" pattern="yyyyMMdd"/>
- </tstamp>
- <antcall target="release.version">
- <param name="version" value="${release.version}-${today}"/>
- <param name="directory" value="${nightly.dir}"/>
- </antcall>
- </target>
-
- <!--=======================================================================-->
- <target name="release.final">
- <antcall target="release.version">
- <param name="version" value="${release.version}"/>
- <param name="directory" value="${release.dir}"/>
- </antcall>
- </target>
-
- <!--=======================================================================-->
- <target name="release.version" depends="javadoc">
- <echo message="Building release ${version} to ${directory}"/>
- <echo message="dest.install.dir is ${dest.install.dir}"/>
- <!-- source packages -->
- <mkdir dir="${directory}"/>
- <zip zipfile="${directory}/jsword-${version}-src.zip">
- <zipfileset prefix="jsword-${version}/jsword" dir="../jsword/src/main/java"/>
- <zipfileset prefix="jsword-${version}/jsword" dir="../jsword/src/main/resources"/>
- <zipfileset prefix="jsword-${version}/common-swing" dir="../common-swing/src/main/java"/>
- <!-- <zipfileset prefix="jsword-${version}/common-swing" dir="../common-swing/src/main/resources"/> -->
- <zipfileset prefix="jsword-${version}/bibledesktop" dir="../bibledesktop/src/main/java"/>
- <zipfileset prefix="jsword-${version}/bibledesktop" dir="../bibledesktop/src/main/resources"/>
- </zip>
- <tar tarfile="${directory}/jsword-${version}-src.tar.gz" compression="gzip">
- <tarfileset prefix="jsword-${version}/jsword" dir="../jsword/src/main/java"/>
- <tarfileset prefix="jsword-${version}/jsword" dir="../jsword/src/main/resources"/>
- <tarfileset prefix="jsword-${version}/common-swing" dir="../common-swing/src/main/java"/>
- <!-- <tarfileset prefix="jsword-${version}/common-swing" dir="../common-swing/src/main/resources"/> -->
- <tarfileset prefix="jsword-${version}/bibledesktop" dir="../bibledesktop/src/main/java"/>
- <tarfileset prefix="jsword-${version}/bibledesktop" dir="../bibledesktop/src/main/resources"/>
- </tar>
- <!-- binary packages -->
- <zip zipfile="${directory}/jsword-${version}-bin.zip">
- <zipfileset prefix="jsword-${version}" dir="${dest.install.dir}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
- </zip>
- <tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
- <tarfileset prefix="jsword-${version}" dir="${dest.install.dir}" excludes="BibleDesktop.app.zip,BibleDesktopSetup.exe"/>
- </tar>
- <symlink link="${directory}/jsword-latest-bin.tar.gz"
- resource="${directory}/jsword-${version}-bin.tar.gz"
- overwrite="true"
- failonerror="false"
- />
- <!-- documentation packages -->
- <zip zipfile="${directory}/jsword-${version}-doc.zip">
- <zipfileset prefix="jsword-${version}" dir="${target.web}/api"/>
- </zip>
- <tar tarfile="${directory}/jsword-${version}-doc.tar.gz" compression="gzip">
- <tarfileset prefix="jsword-${version}" dir="${target.web}/api"/>
- </tar>
- </target>
-
- <!--=======================================================================
- <target name="test.suite" depends="alltests" description="Run a full test suite">
- </target>
--->
</project>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="checkstyle,"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -12,7 +12,7 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2013-03-09 16:23:50 UTC (rev 2287)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2013-03-10 00:32:41 UTC (rev 2288)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/J2SE 5.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
More information about the jsword-svn
mailing list