Kaydet (Commit) e699314d authored tarafından Michael Meeks's avatar Michael Meeks

nlpsolver: migrate the build to use native gnumake build

Remove dmake, build.pl and ant build cruft. Update extension
description, cleanup file locations etc.
Switch to passive registration.
üst 9df9da38
......@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
lotuswordpro \
MathMLDTD \
Mesa \
nlpsolver \
o3tl \
offapi \
oovbaapi \
......
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Initial Developer of the Original Code is
# Peter Foley <pefoley2@verizon.net>
# Portions created by the Initial Developer are Copyright (C) 2011 the
# Initial Developer. All Rights Reserved.
#
# Major Contributor(s):
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
#
$(eval $(call gb_Extension_Extension,nlpsolver,nlpsolver/src/com/sun/star/comp/Calc/NLPSolver))
$(eval $(call gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/components.rdb))
$(eval $(call gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar))
$(eval $(call gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar))
$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*.properties), \
$(eval $(call gb_Extension_add_file,nlpsolver,locale/$(notdir $(trans)),$(trans)))))
$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \
$(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp))
$(eval $(call gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \
$(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp))
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_Jar_Jar,EvolutionarySolver))
$(eval $(call gb_Jar_add_jars,EvolutionarySolver,\
))
$(eval $(call gb_Jar_set_packageroot,EvolutionarySolver,net/adaptivebox))
$(eval $(call gb_Jar_set_manifest,EvolutionarySolver,$(SRCDIR)/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/Manifest.mf))
$(eval $(call gb_Jar_add_sourcefiles,EvolutionarySolver,\
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior \
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent \
))
# vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_Jar_Jar,nlpsolver))
$(eval $(call gb_Jar_add_jars,nlpsolver,\
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
$(OUTDIR)/bin/jurt.jar \
$(OUTDIR)/bin/juh.jar \
$(OUTDIR)/bin/java_uno.jar \
$(OUTDIR)/bin/EvolutionarySolver.jar \
))
$(eval $(call gb_Jar_set_packageroot,nlpsolver,com))
$(eval $(call gb_Jar_set_manifest,nlpsolver,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Manifest.mf))
$(eval $(call gb_Jar_set_jarclasspath,nlpsolver,\
EvolutionarySolver.jar \
))
$(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Registration \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/ProgressBar \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/ModalState \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/DummyEvolutionarySolverStatusDialog \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/ResourceManager \
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver \
))
# vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
......@@ -25,44 +26,14 @@
#
#*************************************************************************
PRJ=.
PRJNAME=nlpsolver
TARGET=nlpsolver
.IF "$(SOLAR_JAVA)"!=""
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
# --- Files --------------------------------------------------------
TARFILE_MD5=90401bca927835b6fbae4a707ed187c8
TARFILE_NAME=nlpsolver-0.9
TARFILE_ROOTDIR=nlpsolver-0.9
PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/locale/ && rm *de_DE* && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj uno-package
.ELSE
BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) uno-package
.ENDIF
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
# --- Targets ------------------------------------------------------
gb_PARTIALBUILD := T
include $(SOLARENV)/gbuild/gbuild.mk
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
.ELSE
all:
@echo java disabled
.ENDIF
endif
# vim: set noet sw=4 ts=4:
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_Module_Module,nlpsolver))
ifeq ($(SOLAR_JAVA),TRUE)
$(eval $(call gb_Module_add_targets,nlpsolver,\
Jar_EvolutionarySolver \
Jar_nlpsolver \
Extension_nlpsolver \
))
endif
# vim: set noet sw=4 ts=4:
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="EvolutionarySolver" default="default" basedir=".">
<description>Builds, tests, and runs the project EvolutionarySolver.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="EvolutionarySolver-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
build.xml.data.CRC32=ea0a88ad
build.xml.script.CRC32=22c5d290
build.xml.stylesheet.CRC32=958a1d3e
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ea0a88ad
nbproject/build-impl.xml.script.CRC32=8e195e02
nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/EvolutionarySolver.jar
dist.javadoc.dir=${dist.dir}/javadoc
excludes=
includes=**
jar.compress=false
javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=1.5
javac.target=1.5
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit.classpath}:\
${libs.junit_4.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>EvolutionarySolver</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<project name="NLPSolver" default="default" basedir=".">
<description>Builds, tests, and runs the project extension project.</description>
<import file="nbproject/build-uno-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-pre-uno-package: called before OXT creation
-post-uno-package: called after OXT creation
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="TypeBrowser2-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser 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
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
--- misc/nlpsolver-0.9/nbproject/build-uno-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
+++ misc/build/nlpsolver-0.9/nbproject/build-uno-impl.xml 2009-10-28 18:22:40.000000000 +0100
@@ -197,7 +197,7 @@
<!-- enter the class path with external jars, if external jars exit and the user did not enter his own -->
<target name="-do-class-path" depends="-external-jars,-check-class-path" unless="class.path.exists">
<manifest file="${build.dir}/MANIFEST.MF" mode="update">
- <attribute name="Class-Path" value="${external.jars}"/>
+ <attribute name="Class-Path" value="${external.jar.dir}/EvolutionarySolver.jar"/>
</manifest>
</target>
<target name="-check-class-path">
--- misc/nlpsolver-0.9/nbproject/project.properties.old 2009-03-30 18:32:00.000000000 +0200
+++ misc/build/nlpsolver-0.9/nbproject/project.properties 2009-10-28 18:09:01.000000000 +0100
@@ -27,8 +27,10 @@ file.reference.EvolutionarySolver.jar=Th
includes=**
jar.compress=false
javac.classpath=\
- ${libs.StarOffice 9.classpath}:\
- ${libs.OpenOffice.org 3.0.classpath}:\
+ ${solar.jar}/juh.jar:\
+ ${solar.jar}/jurt.jar:\
+ ${solar.jar}/ridl.jar:\
+ ${solar.jar}/unoil.jar:\
${reference.EvolutionarySolver.jar}
# Space-separated list of extra javac options
javac.compilerargs=
--- misc/nlpsolver-0.9/nbproject/build-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
+++ misc/build/nlpsolver-0.9/nbproject/build-impl.xml 2009-10-28 18:19:53.000000000 +0100
@@ -360,6 +360,8 @@ is divided into following sections:
-->
<target depends="init" name="deps-jar" unless="no.deps">
<ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
+ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
+ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
<target depends="init" name="-check-automatic-build">
--- misc/nlpsolver-0.9/src/description.xml.old 2009-03-30 16:56:42.000000000 +0200
+++ misc/build/nlpsolver-0.9/src/description.xml 2009-10-28 18:29:13.000000000 +0100
@@ -12,11 +12,6 @@
<extension-description>
<src lang="en" xlink:href="description/extensiondescription.txt"/>
</extension-description>
- <registration>
- <simple-license accept-by="admin" default-license-id="en">
- <license-text lang="en" license-id="en" xlink:href="licenses/lgpl-3.0.txt"/>
- </simple-license>
- </registration>
<dependencies>
<OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/>
</dependencies>
--- misc/build/nlpsolver-0.9/src/locale/NLPSolverCommon_en_US.properties.old 2009-03-30 18:20:06.000000000 +0200
+++ misc/build/nlpsolver-0.9/src/locale/NLPSolverCommon_en_US.properties 2010-12-18 22:08:47.084693100 +0100
@@ -2,7 +2,7 @@
NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
#BaseEvolutionarySolver
-NLPSolverCommon.Properties.SwarmSize=Size of Swam
+NLPSolverCommon.Properties.SwarmSize=Size of Swarm
NLPSolverCommon.Properties.LibrarySize=Size of Library
NLPSolverCommon.Properties.LearningCycles=Learning Cycles
NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing
nlpsolver nlpsolver : javaunohelper unoil jurt NULL
nlpsolver nlpsolver usr1 - all nlpsolver_mkout NULL
nlpsolver nlpsolver nmake - all nlpsolver_nlpsolver NULL
nlpsolver nlpsolver\prj nmake - all nlp_prj NULL
..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin\NLPSolver.oxt
......@@ -99,7 +99,7 @@ public abstract class BaseNLPSolver extends WeakBase
}
resourceManager = new ResourceManager(xContext, "com.sun.star.comp.Calc.NLPSolver", "/locale", "NLPSolverCommon");
registerProperty(m_assumeNonNegative);
}
......
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CentralRegistrationClass.java,v $
* $Revision: 1.1 $
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
package com.sun.star.comp.Calc.NLPSolver;
import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.registry.XRegistryKey;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
/**
*
* @author as231978
*/
public class CentralRegistrationClass {
public static XSingleComponentFactory __getComponentFactory( String sImplementationName ) {
String regClassesList = getRegistrationClasses();
StringTokenizer t = new StringTokenizer(regClassesList, " ");
while (t.hasMoreTokens()) {
String className = t.nextToken();
if (className != null && className.length() != 0) {
try {
Class regClass = Class.forName(className);
Method writeRegInfo = regClass.getDeclaredMethod("__getComponentFactory", new Class[]{String.class});
Object result = writeRegInfo.invoke(regClass, sImplementationName);
if (result != null) {
return (XSingleComponentFactory)result;
}
}
catch (ClassNotFoundException ex) {
ex.printStackTrace();
} catch (ClassCastException ex) {
ex.printStackTrace();
} catch (SecurityException ex) {
ex.printStackTrace();
} catch (NoSuchMethodException ex) {
ex.printStackTrace();
} catch (IllegalArgumentException ex) {
ex.printStackTrace();
} catch (InvocationTargetException ex) {
ex.printStackTrace();
} catch (IllegalAccessException ex) {
ex.printStackTrace();
}
}
}
return null;
}
public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey ) {
boolean bResult = true;
String regClassesList = getRegistrationClasses();
StringTokenizer t = new StringTokenizer(regClassesList, " ");
while (t.hasMoreTokens()) {
String className = t.nextToken();
if (className != null && className.length() != 0) {
try {
Class regClass = Class.forName(className);
Method writeRegInfo = regClass.getDeclaredMethod("__writeRegistryServiceInfo", new Class[]{XRegistryKey.class});
Object result = writeRegInfo.invoke(regClass, xRegistryKey);
bResult &= ((Boolean)result).booleanValue();
}
catch (ClassNotFoundException ex) {
ex.printStackTrace();
} catch (ClassCastException ex) {
ex.printStackTrace();
} catch (SecurityException ex) {
ex.printStackTrace();
} catch (NoSuchMethodException ex) {
ex.printStackTrace();
} catch (IllegalArgumentException ex) {
ex.printStackTrace();
} catch (InvocationTargetException ex) {
ex.printStackTrace();
} catch (IllegalAccessException ex) {
ex.printStackTrace();
}
}
}
return bResult;
}
private static String getRegistrationClasses() {
CentralRegistrationClass c = new CentralRegistrationClass();
String name = c.getClass().getCanonicalName().replace('.', '/').concat(".class");
try {
Enumeration<URL> urlEnum = c.getClass().getClassLoader().getResources("META-INF/MANIFEST.MF");
while (urlEnum.hasMoreElements()) {
URL url = urlEnum.nextElement();
String file = url.getFile();
JarURLConnection jarConnection =
(JarURLConnection) url.openConnection();
Manifest mf = jarConnection.getManifest();
Attributes attrs = (Attributes) mf.getAttributes(name);
if ( attrs != null ) {
String classes = attrs.getValue( "RegistrationClasses" );
return classes;
}
}
} catch (IOException ex) {
ex.printStackTrace();
}
return "";
}
/** Creates a new instance of CentralRegistrationClass */
private CentralRegistrationClass() {
}
}
RegistrationClassName: com.sun.star.comp.Calc.NLPSolver.Registration
......@@ -55,7 +55,7 @@ public class PropertyInfo<PropType> {
public String getDescription() {
return m_description;
}
public void setValue(Object value) throws IllegalArgumentException {
if (m_property.Type == Type.LONG) {
if (!(value instanceof Integer))
......@@ -97,8 +97,9 @@ public class PropertyInfo<PropType> {
public void localize(ResourceManager resourceManager) {
try {
m_description = resourceManager.getLocalizedString("Properties." + m_property.Name);
System.out.println("Localised description to " + m_description);
} catch (com.sun.star.resource.MissingResourceException ex) {
System.out.println("No properties file !");
}
}
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License or as specified alternatively below. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* Major Contributor(s):
* Copyright (C) 2011 Novell, Inc. (initial developer)
*
* All Rights Reserved.
*
* For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
package com.sun.star.comp.Calc.NLPSolver;
import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lang.XSingleComponentFactory;
import java.io.IOException;
public final class Registration {
private static final String[] m_serviceNames = {
"com.sun.star.beans.PropertySet",
"com.sun.star.sheet.Solver"
};
public static XSingleComponentFactory __getComponentFactory( String sImplementationName )
{
XSingleComponentFactory xFactory = null;
System.out.println("Get component '" + sImplementationName + "'");
if ( sImplementationName.equals( "com.sun.star.comp.Calc.NLPSolver.DEPSSolverImpl" ) )
xFactory = Factory.createComponentFactory( com.sun.star.comp.Calc.NLPSolver.DEPSSolverImpl.class,
m_serviceNames );
if ( sImplementationName.equals( "com.sun.star.comp.Calc.NLPSolver.SCOSolverImpl" ) )
xFactory = Factory.createComponentFactory( com.sun.star.comp.Calc.NLPSolver.SCOSolverImpl.class,
m_serviceNames );
System.out.println("Return factory " + xFactory);
return xFactory;
}
private Registration() {}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,16 +7,11 @@
<name lang="en">Solver for Nonlinear Programming</name>
</display-name>
<publisher>
<name lang="en" xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095">Sun Microsystems</name>
<name lang="en" xlink:href="http://www.documentfoundation.org">The Document Foundation</name>
</publisher>
<extension-description>
<src lang="en" xlink:href="description/extensiondescription.txt"/>
<src lang="en" xlink:href="description-en-US.txt"/>
</extension-description>
<registration>
<simple-license accept-by="admin" default-license-id="en">
<license-text lang="en" license-id="en" xlink:href="licenses/lgpl-3.0.txt"/>
</simple-license>
</registration>
<dependencies>
<OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/>
</dependencies>
......
<?xml version="1.0" encoding="UTF-8"?>
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
manifest:full-path="NLPSolver.jar"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
manifest:full-path="components.rdb"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
manifest:full-path="help"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
......
......@@ -2,7 +2,7 @@
NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
#BaseEvolutionarySolver
NLPSolverCommon.Properties.SwarmSize=Size of Swam
NLPSolverCommon.Properties.SwarmSize=Size of Swarm
NLPSolverCommon.Properties.LibrarySize=Size of Library
NLPSolverCommon.Properties.LearningCycles=Learning Cycles
NLPSolverCommon.Properties.GuessVariableRange=Variable Bounds Guessing
......
......@@ -77,7 +77,6 @@ c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
......
......@@ -207,7 +207,7 @@ End
Directory gid_Brand_Dir_Share_Extensions_NLPSolver
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "NLPSolver";
DosName = "nlpsolver";
End
#endif
......
......@@ -238,7 +238,7 @@ File gid_File_Oxt_NLPSolver
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
Name = "NLPSolver.oxt";
Name = "nlpsolver.oxt";
End
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment