Skip to content

Commit

Permalink
Merge pull request #17 from rmraya/ts
Browse files Browse the repository at this point in the history
Updated for release 5.0
  • Loading branch information
rmraya authored Jan 22, 2025
2 parents fd2f141 + 58ccf9b commit b2abeb7
Show file tree
Hide file tree
Showing 434 changed files with 210,284 additions and 30,513 deletions.
14 changes: 9 additions & 5 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JavaSE-21">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<classpathentry kind="lib" path="jars/bcp47j.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Expand Down Expand Up @@ -31,21 +36,20 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/swordfish.jar">
<classpathentry kind="lib" path="jars/sqlite-jdbc-3.48.0.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/xmljava.jar">
<classpathentry kind="lib" path="jars/swordfish.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/swt.jar">
<classpathentry kind="lib" path="jars/xmljava.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/h2-1.4.200.jar"/>
<classpathentry kind="output" path="out"/>
</classpath>
13 changes: 6 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
.DS_Store
.vscode
jars/fluenta.jar
jars/swt.jar
docs/en/out
docs/es/out
out
bin
conf
include
legal
lib
release
docs/out
dist
.vscode/launch.json
.vscode/settings.json
.scannerwork
js
node_modules
package-lock.json
docs/en/out
docs/es/out
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>FluentaPRO</name>
<name>Fluenta</name>
<comment></comment>
<projects>
</projects>
Expand Down
34 changes: 0 additions & 34 deletions LOCALIZATION.md

This file was deleted.

39 changes: 30 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ You can subscribe to [Maxprograms Support](https://groups.io/g/maxprograms/) at

### Subscriptions

Ready to use installers and technical support for Fluenta are available as yearly subscriptions at [Maxprograms Online Store](https://www.maxprograms.com/store/buy.html).
Subscriptions are available for technical support, bug fixes, and feature requests. By subscribing to a support plan, you contribute to the continuous improvement of Fluenta. Your subscription fees pay for code development costs and ensure the quality and reliability of the software.

The version of Fluenta included in the official installers from [Fluenta's Home Page](https://www.maxprograms.com/products/fluenta.html) can be used at no cost for 30 days requesting a free Evaluation Key.
Subscription Keys are available at [Maxprograms Online Store](https://www.maxprograms.com/store/buy.html). Subscription Keys cannot be shared or transferred to different machines.

The version of Fluenta included in the official installers from [Fluenta's Downloads Page](https://www.maxprograms.com/products/fluentadownload.html) can be used at no cost for 30 days requesting a free Evaluation Key.

Subscription version includes unlimited email support at [[email protected]](mailto:[email protected]).

Expand All @@ -34,20 +36,39 @@ Differences | From Source Code | Subscription Based
Ready To Use Installers| No | Yes
Notarized macOS launcher| No | Yes
Signed launcher and installer for Windows | No | Yes
Restricted Features | None | None
Headless mode batch scripts for running from CLI (Command Line Interface) | No | Yes
Technical Support | Peer support at [Groups.io](https://groups.io/g/maxprograms/)| - Direct email at [[email protected]](mailto:[email protected]) <br> - Peer support at [Groups.io](https://groups.io/g/maxprograms/)

## Installers

Ready to use installers are available at [https://www.maxprograms.com/products/fluenta.html](https://www.maxprograms.com/products/fluenta.html).
Ready to use installers are available at [https://www.maxprograms.com/products/fluentadownload.html](https://www.maxprograms.com/products/fluentadownload.html).

## Building Yourself

You need JAVA 17 and [Apache Ant 1.10.12](https://ant.apache.org) or newer
You need these tools to build Fluenta:

- Java 21 LTS, get it from [https://adoptium.net/](https://adoptium.net/)
- Apache Ant 1.10.14, get it from [https://ant.apache.org](https://ant.apache.org)
- NodeJS 22.12.0 LTS, get it it from [https://nodejs.org/](https://nodejs.org/)

### Building Fluenta

- Checkout this repository
- Point your JAVA_HOME variable to JDK 17
- Copy the appropriate version of `swt.jar` from `SWT` folder to `jars` folder
- Run `ant` to compile the source code
- Point your `JAVA_HOME` variable to JDK 21
- Run `ant` to compile the Java code
- Install the NodeJS dependencies with `npm install`

```shell
git clone https://github.com/rmraya/Fluenta.git
cd Fluenta
ant
npm install
```

### Running Fluenta

After building the code, you can launch fluenta with the following command:

Use `fluenta.bat`, `fluenta_mac.sh` or `fluenta_linux.sh` to run Fluenta.
```shell
npm start
```
Binary file removed SWT/aarch64/swt.jar
Binary file not shown.
Binary file removed SWT/gtk64/swt.jar
Binary file not shown.
Binary file removed SWT/mac64/swt.jar
Binary file not shown.
Binary file removed SWT/win64/swt.jar
Binary file not shown.
18 changes: 5 additions & 13 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project basedir="." default="dist" name="Fluenta">
<property name="target" value="17" />
<property name="source" value="17" />
<property name="target" value="21" />
<property name="source" value="21" />
<property name="build.compiler" value="javac10+" />
<path id="Fluenta.classpath">
<pathelement location="jars/bcp47j.jar" />
<pathelement location="jars/dtd.jar" />
<pathelement location="jars/h2-1.4.200.jar" />
<pathelement location="jars/json.jar" />
<pathelement location="jars/jsoup.jar" />
<pathelement location="jars/mapdb.jar" />
<pathelement location="jars/sqlite-jdbc-3.48.0.0.jar" />
<pathelement location="jars/openxliff.jar" />
<pathelement location="jars/swordfish.jar" />
<pathelement location="jars/xmljava.jar" />
<pathelement location="jars/swt.jar" />
</path>
<condition property="isWindows">
<os family="windows" />
Expand Down Expand Up @@ -57,9 +57,6 @@
<move todir=".\conf">
<fileset dir="dist\conf" />
</move>
<move todir=".\include">
<fileset dir="dist\include" />
</move>
<move todir=".\legal">
<fileset dir="dist\legal" />
</move>
Expand All @@ -69,7 +66,6 @@
<move file="dist\release" todir="." />
<delete dir="dist" failonerror="true" />
<delete file=".\jars\fluenta.jar" />
<copy file=".\jars\h2-1.4.200.jar" todir="lib" />
</target>
<target name="copyUnix" unless="isWindows">
<description>Move java binaries to work folder</description>
Expand All @@ -79,9 +75,6 @@
<move todir="./conf">
<fileset dir="dist/conf" />
</move>
<move todir="./include">
<fileset dir="dist/include" />
</move>
<move todir="./legal">
<fileset dir="dist/legal" />
</move>
Expand All @@ -91,11 +84,10 @@
<move file="dist/release" todir="." />
<delete dir="dist" failonerror="false" />
<delete file="jars/fluenta.jar" />
<copy file="jars/h2-1.4.200.jar" todir="lib" />
</target>
<target name="link" depends="distclean,compile">
<description>Build Java binaries</description>
<link destDir="dist" modulepath="jars:${java.home}/jmods">
<link destDir="dist" modulepath="jars:${java.home}/jmods" includeManPages="false" includeHeaders="false" >
<module name="fluenta" />
</link>
<delete file="dist/lib/jrt-fs.jar" />
Expand Down
73 changes: 71 additions & 2 deletions catalog/catalog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<system systemId="xliff-core-1.2-transitional.xsd" uri="xliff/xliff-core-1.2-transitional.xsd" />
<nextCatalog catalog="xliff2.0/catalog.xml" />
<nextCatalog catalog="xliff2.1/catalog.xml" />
<nextCatalog catalog="xliff2.2/catalog.xml" />

<uri name="urn:lisa-metrics-tags" uri="gmx-v/gmx-v.xsd" />
<system systemId="http://www.xml-intl.com/dtd/GMX-V.xsd" uri="gmx-v/gmx-v.xsd" />
Expand Down Expand Up @@ -63,6 +64,7 @@
<system systemId="tbxxcsdtd.dtd" uri="tbx/tbxxcsdtd.dtd" />
<uri name="urn:TBXcs" uri="tbx/TBXcsV02.xsd" />
<uri name="x-schema:TBXdsV1-0.xml" uri="tbx/TBXdsV1-0.xml" />
<uri name="urn:iso:std:iso:30042:ed-2" uri="tbx/TBXcoreStructV03.rng" />

<public publicId="-//SRX//DTD SRX//EN" uri="srx/srx.dtd" />
<system systemId="srx.dtd" uri="srx/srx.dtd" />
Expand All @@ -88,11 +90,77 @@
<system systemId="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" uri="xhtml1.1/xhtml11-model-1.mod" />
<uri name="http://www.w3.org/1999/xhtml" uri="xhtml1.1/xhtml11-flat.dtd" />
<system systemId="xhtml11.dtd" uri="xhtml1.1/xhtml11-flat.dtd" />
<public publicId="-//W3C//ENTITIES XHTML Modular Framework 1.0//EN" uri="xhtml1.1/xhtml-framework-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" uri="xhtml1.1/xhtml-framework-1.mod" />
<public publicId="-//W3C//ENTITIES XHTML Datatypes 1.0//EN" uri="xhtml1.1/xhtml-datatypes-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-datatypes-1.mod" uri="xhtml1.1/xhtml-datatypes-1.mod" />
<public publicId="-//W3C//ENTITIES XHTML Qualified Names 1.0//EN" uri="xhtml1.1/xhtml-qname-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-qname-1.mod" uri="xhtml1.1/xhtml-qname-1.mod" />
<public publicId="-//W3C//ENTITIES XHTML Common Attributes 1.0//EN" uri="xhtml1.1/xhtml-attribs-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-attribs-1.mod" uri="xhtml1.1/xhtml-attribs-1.mod" />
<public publicId="-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN" uri="xhtml1.1/xhtml-events-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-events-1.mod" uri="xhtml1.1/xhtml-events-1.mod" />
<public publicId="-//W3C//ENTITIES XHTML Character Entities 1.0//EN" uri="xhtml1.1/xhtml-charent-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-charent-1.mod" uri="xhtml1.1/xhtml-charent-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Text 1.0//EN" uri="xhtml1.1/xhtml-text-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" uri="xhtml1.1/xhtml-text-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN" uri="xhtml1.1/xhtml-inlstruct-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-inlstruct-1.mod" uri="xhtml1.1/xhtml-inlstruct-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN" uri="xhtml1.1/xhtml-inlphras-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-inlphras-1.mod" uri="xhtml1.1/xhtml-inlphras-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Block Structural 1.0//EN" uri="xhtml1.1/xhtml-blkstruct-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-blkstruct-1.mod" uri="xhtml1.1/xhtml-blkstruct-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN" uri="xhtml1.1/xhtml-blkphras-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-blkphras-1.mod" uri="xhtml1.1/xhtml-blkphras-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Hypertext 1.0//EN" uri="xhtml1.1/xhtml-hypertext-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" uri="xhtml1.1/xhtml-hypertext-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Lists 1.0//EN" uri="xhtml1.1/xhtml-list-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" uri="xhtml1.1/xhtml-list-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN" uri="xhtml1.1/xhtml-edit-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" uri="xhtml1.1/xhtml-edit-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML BDO Element 1.0//EN" uri="xhtml1.1/xhtml-bdo-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" uri="xhtml1.1/xhtml-bdo-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Ruby 1.0//EN" uri="xhtml1.1/xhtml-ruby-1.mod" />
<uri name="http://www.w3.org/TR/ruby/xhtml-ruby-1.mod" uri="xhtml1.1/xhtml-ruby-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Presentation 1.0//EN" uri="xhtml1.1/xhtml-pres-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" uri="xhtml1.1/xhtml-pres-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN" uri="xhtml1.1/xhtml-inlpres-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-inlpres-1.mod" uri="xhtml1.1/xhtml-inlpres-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN" uri="xhtml1.1/xhtml-blkpres-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-blkpres-1.mod" uri="xhtml1.1/xhtml-blkpres-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Link Element 1.0//EN" uri="xhtml1.1/xhtml-link-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" uri="xhtml1.1/xhtml-link-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Metainformation 1.0//EN" uri="xhtml1.1/xhtml-meta-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" uri="xhtml1.1/xhtml-meta-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Base Element 1.0//EN" uri="xhtml1.1/xhtml-base-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" uri="xhtml1.1/xhtml-base-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Scripting 1.0//EN" uri="xhtml1.1/xhtml-script-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" uri="xhtml1.1/xhtml-script-1.mod" />
<public publicId="-//W3C//DTD XHTML Style Sheets 1.0//EN" uri="xhtml1.1/xhtml-style-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" uri="xhtml1.1/xhtml-style-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Images 1.0//EN" uri="xhtml1.1/xhtml-image-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" uri="xhtml1.1/xhtml-image-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN" uri="xhtml1.1//xhtml-csismap-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" uri="xhtml1.1//xhtml-csismap-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN" uri="xhtml1.1/xhtml-ssismap-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" uri="xhtml1.1/xhtml-ssismap-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Param Element 1.0//EN" uri="xhtml1.1/xhtml-param-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" uri="xhtml1.1/xhtml-param-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN" uri="xhtml1.1/xhtml-object-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" uri="xhtml1.1/xhtml-object-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Tables 1.0//EN" uri="xhtml1.1/xhtml-table-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" uri="xhtml1.1/xhtml-table-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Forms 1.0//EN" uri="xhtml1.1/xhtml-form-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" uri="xhtml1.1/xhtml-form-1.mod" />
<public publicId="-//W3C//ELEMENTS XHTML Document Structure 1.0//EN" uri="xhtml1.1/xhtml-struct-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" uri="xhtml1.1/xhtml-struct-1.mod" />
<public publicId="-//W3C//NOTATIONS XHTML Notations 1.0//EN" uri="xhtml1.1/xhtml-notations-1.mod" />
<uri name="http://www.w3.org/MarkUp/DTD/xhtml-notations-1.mod" uri="xhtml1.1/xhtml-notations-1.mod" />

<public publicId="-//W3C//DTD SVG 1.0//EN" uri="svg/svg10.dtd" />
<system systemId="http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" uri="svg/svg10.dtd" />
<uri name="http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" uri="svg/svg10.dtd" />
<public publicId="-//W3C//DTD SVG 1.1//EN" uri="svg/svg11.dtd" />
<system systemId="http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" uri="svg/svg11.dtd" />
<uri name="http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" uri="svg/svg11.dtd" />

<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN" uri="openoffice/office.dtd" />
<system systemId="office.dtd" uri="openoffice/office.dtd" />
Expand Down Expand Up @@ -123,6 +191,7 @@

<!-- DocBook -->

<nextCatalog catalog="docbook5.2/catalog.xml" />
<nextCatalog catalog="docbook5.0/catalog.xml" />
<nextCatalog catalog="docbook4.5/catalog.xml" />
<nextCatalog catalog="docbook4.4/catalog.xml" />
Expand Down
2 changes: 1 addition & 1 deletion catalog/docbook4.3/docbook.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
of DocBook.
-->

<!ENTITY % sgml.features "INCLUDE">
<!ENTITY % sgml.features "IGNORE">

<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"docbookx.dtd">
Expand Down
26 changes: 26 additions & 0 deletions catalog/docbook5.2/assembly.nvdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
The DocBook Schema Version 5.2
Committee Specification 01
19 July 2023
Copyright (c) OASIS Open 2023. All Rights Reserved.
Source: https://docs.oasis-open.org/docbook/docbook/v5.2/cs01/
Link to latest version of specification: https://docs.oasis-open.org/docbook/docbook/v5.2/docbook-v5.2.html
-->
<rules xmlns="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"
startMode="assembly">

<mode name="assembly">
<namespace ns="http://docbook.org/ns/docbook">
<validate schema="rng/assembly.rng" useMode="attach"/>
<validate schema="sch/assembly.sch" useMode="attach"/>
</namespace>
</mode>

<mode name="attach">
<anyNamespace>
<attach/>
</anyNamespace>
</mode>

</rules>
Loading

0 comments on commit b2abeb7

Please sign in to comment.