Skip to content

Commit

Permalink
[#455] Rename the Liqp package
Browse files Browse the repository at this point in the history
- org.eclipse.embedcdt.core.liqp
- add org.jsoup 1.7.2 from Eclipse Orbit
  • Loading branch information
ilg-ul committed Dec 6, 2020
1 parent b4304fb commit ff578da
Show file tree
Hide file tree
Showing 82 changed files with 19,351 additions and 80 deletions.
2 changes: 1 addition & 1 deletion plugins/org.eclipse.embedcdt.core/.classpath
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/org.jsoup_1.7.2.v201411291515.jar"/>
<classpathentry exported="true" kind="lib" path="lib/json-simple-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.5.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.9.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.9.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.9.9.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/liqp-0.6.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ST4-4.0.8.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Expand Down
61 changes: 9 additions & 52 deletions plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %bundle.vendor
Bundle-Localization: plugin
Export-Package: liqp;version="0.6.8";
x-friends:="org.eclipse.embedcdt,
org.eclipse.embedcdt.codered,
org.eclipse.embedcdt.codered.ui,
org.eclipse.embedcdt.core,
org.eclipse.embedcdt.debug.core,
org.eclipse.embedcdt.debug.gdbjtag,
org.eclipse.embedcdt.debug.gdbjtag.core,
org.eclipse.embedcdt.debug.gdbjtag.jlink,
org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
org.eclipse.embedcdt.debug.gdbjtag.openocd,
org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
org.eclipse.embedcdt.debug.gdbjtag.pyocd,
org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
org.eclipse.embedcdt.debug.gdbjtag.qemu,
org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
org.eclipse.embedcdt.debug.gdbjtag.ui,
org.eclipse.embedcdt.debug.packs,
org.eclipse.embedcdt.doc.user,
org.eclipse.embedcdt.managedbuild.cross,
org.eclipse.embedcdt.managedbuild.cross.arm,
org.eclipse.embedcdt.managedbuild.cross.arm.core,
org.eclipse.embedcdt.managedbuild.cross.arm.ui,
org.eclipse.embedcdt.managedbuild.cross.core,
org.eclipse.embedcdt.managedbuild.cross.riscv,
org.eclipse.embedcdt.managedbuild.cross.riscv.core,
org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
org.eclipse.embedcdt.managedbuild.cross.ui,
org.eclipse.embedcdt.managedbuild.packs.ui,
org.eclipse.embedcdt.packs,
org.eclipse.embedcdt.packs.core,
org.eclipse.embedcdt.packs.ui,
org.eclipse.embedcdt.templates.ad,
org.eclipse.embedcdt.templates.ad.ui,
org.eclipse.embedcdt.templates.core,
org.eclipse.embedcdt.templates.cortexm,
org.eclipse.embedcdt.templates.cortexm.ui,
org.eclipse.embedcdt.templates.freescale,
org.eclipse.embedcdt.templates.freescale.pe.ui,
org.eclipse.embedcdt.templates.freescale.ui,
org.eclipse.embedcdt.templates.sifive,
org.eclipse.embedcdt.templates.sifive.ui,
org.eclipse.embedcdt.templates.stm,
org.eclipse.embedcdt.templates.stm.ui,
org.eclipse.embedcdt.ui",
org.eclipse.embedcdt.core,
Export-Package: org.eclipse.embedcdt.core,
org.eclipse.embedcdt.core.liqp,
org.eclipse.embedcdt.core.liqp.exceptions,
org.eclipse.embedcdt.core.liqp.filters,
org.eclipse.embedcdt.core.liqp.nodes,
org.eclipse.embedcdt.core.liqp.parser,
org.eclipse.embedcdt.core.liqp.tags,
org.eclipse.embedcdt.core.preferences,
org.eclipse.embedcdt.core.zafarkhaja.semver;
x-friends:="org.eclipse.embedcdt,
Expand Down Expand Up @@ -273,5 +229,6 @@ Bundle-ClassPath: lib/antlr-runtime-3.5.2.jar,
lib/liqp-0.6.8.jar,
lib/ST4-4.0.8.jar,
.,
lib/json-simple-1.1.1.jar
lib/json-simple-1.1.1.jar,
lib/org.jsoup_1.7.2.v201411291515.jar
Automatic-Module-Name: org.eclipse.embedcdt.core
2 changes: 1 addition & 1 deletion plugins/org.eclipse.embedcdt.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ bin.includes = META-INF/,\
lib/jackson-annotations-2.9.9.jar,\
lib/jackson-core-2.9.9.jar,\
lib/jackson-databind-2.9.9.3.jar,\
lib/liqp-0.6.8.jar,\
lib/ST4-4.0.8.jar,\
lib/json-simple-1.1.1.jar,\
lib/org.jsoup_1.7.2.v201411291515.jar,\
about.html,\
.options
src.includes = about.html
26 changes: 6 additions & 20 deletions plugins/org.eclipse.embedcdt.core/lib/README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
## Liquid

I could not find an easy way to bring those JARs automatically, so I copied
them manually from ${HOME}/.m2/repository.

I got the actual versions from the `pom.xml` editor, the _Dependency
Hierarchy_ view.

To add them to the project, in the `plugin.xml` editor, the _Runtime_ tab,
_Classpath_ -> _Add..._; then, to export the `liqp` class, in the
_Exported Packages_ -> _Add..._.

Note: The [Liquid parser](https://github.com/bkiers/Liqp) is [patched](https://github.com/eclipse-embed-cdt/Liqp), to allow for more convenient white space processing, i.e. `-%}` should not be greedy and stop after the first line terminator.

To build the liqp library

- go to the `libq-fork.git` folder
- add maven to PATH (amaven)
- mvn clean package
- copy target/liqp-0.6.8.jar
The Liquid template engine is from the Lipq Java package, copied
here and renamed to the org.eclipse.embedcdt namespace.

It requires the org.jsoup library.

## JSON

The JSON.simple library `json-simple-1.1.1.json` is downloaded from:
Expand Down Expand Up @@ -49,11 +35,11 @@ Already approved. CQ#9858
Submitted as separate CQ

```
> ./plugins/org.eclipse.embedcdt.core/lib/liqp-0.6.8.jar
> ./plugins/org.eclipse.embedcdt.core/lib/org.eclipse.embedcdt.core.liqp-0.6.8.jar
Good contender for first submission. It appears to be MIT license and I don't
think there is a CQ about it already.
https://github.com/bkiers/Liqp/releases/tag/liqp-0.6.8
https://github.com/bkiers/Liqp/releases/tag/org.eclipse.embedcdt.core.liqp-0.6.8
```

To be upgraded:
Expand Down
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit ff578da

Please sign in to comment.