Skip to content

Commit

Permalink
Merge pull request #65 from PellSmit/J-11_G-8.10.7
Browse files Browse the repository at this point in the history
Merge PellSmith/lslforge to 0.1.9.9
  • Loading branch information
raysilent authored Jan 13, 2022
2 parents d749dbe + 199aa85 commit bf62106
Show file tree
Hide file tree
Showing 247 changed files with 1,699 additions and 1,496 deletions.
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ To test the newly built file, you can specify it in the existing LSLForge Eclips
* Windows
* `set LSLFORGE_TEST_DATA=../testing/data` - enough to be set just for the terminal session.
* `stack test`
* Linux / macOS
* `LSLFORGE_TEST_DATA=../testing/data; stack test`
* Linux / macOS on `bash`
* `LSLFORGE_TEST_DATA=../testing/data stack test`

### Version Number Change

Expand All @@ -300,15 +300,16 @@ Switch to `lslforge` subfolder.
* Run `all_compile_haskell_win32_as_admin.bat`
* `eclipse\update-site\clean.bat`
* Linux
* `stack install --executable-stripping`
* `codegen.sh`
* `copy_linux.sh`
* `eclipse/update-site/clean.sh`
* `(cd haskell; stack install --executable-stripping)`
* `./copy_linux.sh` or `./copy_linux64.sh`
* `./codegen.sh`
* `(cd eclipse/update-site; ./clean.sh)`
* macOS
* `stack install --executable-stripping`
* `codegen_mac.sh`
* `copy_mac.sh`
* `eclipse/update-site/clean.sh`
* ``
* `(cd haskell; stack install --executable-stripping)`
* `./copy_mac_x86_64.sh`
* `./codegen.sh`
* `(cd eclipse/update-site; ./clean.sh)`

### Eclipse Plug-in Compilation

Expand Down
Binary file added eclipse/archive/0.1.9.8/artifacts.jar
Binary file not shown.
Binary file added eclipse/archive/0.1.9.8/content.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file modified eclipse/artifacts.jar
Binary file not shown.
Binary file modified eclipse/content.jar
Binary file not shown.
Binary file added eclipse/features/lslforge_0.1.9.9.jar
Binary file not shown.
Binary file added eclipse/features/lslforge_part_linux_x86_0.1.9.9.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added eclipse/features/lslforge_part_win32_x86_0.1.9.9.jar
Binary file not shown.
Binary file added eclipse/plugins/lslforge_0.1.9.9.jar
Binary file not shown.
Binary file added eclipse/plugins/lslforge_linux_x86_0.1.9.9.jar
Binary file not shown.
Binary file added eclipse/plugins/lslforge_linux_x86_64_0.1.9.9.jar
Binary file not shown.
Binary file not shown.
Binary file added eclipse/plugins/lslforge_win32_x86_0.1.9.9.jar
Binary file not shown.
6 changes: 2 additions & 4 deletions lslforge/codegen.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#mv -v eclipse/lslforge/src/lslforge/generated/Tuple2.java Tuple2.save
#mv -v eclipse/lslforge/src/lslforge/generated/Tuple3.java Tuple3.save
#!/bin/sh
rm -v eclipse/lslforge/src/lslforge/generated/*.java
#mv -v eclipse/lslforge/src/lslforge/generated/*.save *.java

eclipse/lslforge-linux-x86/os/linux/x86/LSLForge _CodeGen_ eclipse/lslforge/src/lslforge/generated lslforge.generated
~/.local/bin/LSLForge _CodeGen_ eclipse/lslforge/src/lslforge/generated lslforge.generated
3 changes: 0 additions & 3 deletions lslforge/codegen_mac.sh

This file was deleted.

Empty file modified lslforge/copy_linux.sh
100644 → 100755
Empty file.
5 changes: 5 additions & 0 deletions lslforge/copy_linux64.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
(cd haskell;stack install)
# strip haskell/dist/build/LslForge/LSLForge
strip ~/.local/bin/LSLForge
cp ~/.local/bin/LSLForge eclipse/lslforge-linux-x86_64/os/linux/x86_64
4 changes: 0 additions & 4 deletions lslforge/copy_mac.sh

This file was deleted.

4 changes: 4 additions & 0 deletions lslforge/copy_mac_x86_64.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
(cd haskell;stack install)
strip ~/.local/bin/LSLForge
cp ~/.local/bin/LSLForge eclipse/lslforge-macosx-x86_64/os/macosx/x86_64
4 changes: 2 additions & 2 deletions lslforge/eclipse/lslforge-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="lslforge"
label="LSLforge"
version="0.1.9.8">
version="0.1.9.9">
<install-handler library="" handler=""/>

<copyright>
Expand Down Expand Up @@ -107,6 +107,6 @@ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS&apos;&apos; AND ANY EXPRESS OR I
id="lslforge"
download-size="0"
install-size="0"
version="0.1.9.8"/>
version="0.1.9.9"/>

</feature>
4 changes: 2 additions & 2 deletions lslforge/eclipse/lslforge-linux-x86-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<feature
id="lslforge_part_linux_x86"
label="lslforge_part_linux_x86"
version="0.1.9.8">
version="0.1.9.9">

<requires>
<import plugin="lslforge" version="0.1.9.8" match="greaterOrEqual"/>
<import plugin="lslforge" version="0.1.9.9" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion lslforge/eclipse/lslforge-linux-x86/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
6 changes: 3 additions & 3 deletions lslforge/eclipse/lslforge-linux-x86/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: lslforge_linux_x86 Fragment
Bundle-SymbolicName: lslforge_linux_x86
Bundle-Version: 0.1.9.8
Fragment-Host: lslforge;bundle-version="0.1.9.8"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Version: 0.1.9.9
Fragment-Host: lslforge;bundle-version="0.1.9.9"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: lslforge_linux_x86
4 changes: 2 additions & 2 deletions lslforge/eclipse/lslforge-linux-x86_64-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<feature
id="lslforge_part_linux_x86_64"
label="lslforge_part_linux_x86_64"
version="0.1.9.8">
version="0.1.9.9">

<requires>
<import plugin="lslforge" version="0.1.9.8" match="greaterOrEqual"/>
<import plugin="lslforge" version="0.1.9.9" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion lslforge/eclipse/lslforge-linux-x86_64/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
6 changes: 3 additions & 3 deletions lslforge/eclipse/lslforge-linux-x86_64/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: lslforge_linux_x86_64 Fragment
Bundle-SymbolicName: lslforge_linux_x86_64
Bundle-Version: 0.1.9.8
Fragment-Host: lslforge;bundle-version="0.1.9.8"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Version: 0.1.9.9
Fragment-Host: lslforge;bundle-version="0.1.9.9"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: lslforge_linux_x86_64
18 changes: 0 additions & 18 deletions lslforge/eclipse/lslforge-macosx-x86-feature/feature.xml

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions lslforge/eclipse/lslforge-macosx-x86/META-INF/MANIFEST.MF

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>lslforge-macosx-x86-feature</name>
<name>lslforge-macosx-x86_64-feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
18 changes: 18 additions & 0 deletions lslforge/eclipse/lslforge-macosx-x86_64-feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="lslforge_part_macosx_x86_64"
label="lslforge_part_macosx_x86_64"
version="0.1.9.9">

<requires>
<import plugin="lslforge" version="0.1.9.9" match="greaterOrEqual"/>
</requires>

<plugin
id="lslforge_macosx_x86_64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>

</feature>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>lslforge-macosx-x86</name>
<name>lslforge-macosx-x86_64</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
8 changes: 8 additions & 0 deletions lslforge/eclipse/lslforge-macosx-x86_64/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: lslforge_macosx_x86_64 Fragment
Bundle-SymbolicName: lslforge_macosx_x86_64
Bundle-Version: 0.1.9.9
Fragment-Host: lslforge;bundle-version="0.1.9.9"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: lslforge_macosx_x86_64
4 changes: 2 additions & 2 deletions lslforge/eclipse/lslforge-win32-x86-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<feature
id="lslforge_part_win32_x86"
label="lslforge_part_win32_x86"
version="0.1.9.8">
version="0.1.9.9">

<requires>
<import plugin="lslforge" version="0.1.9.8" match="greaterOrEqual"/>
<import plugin="lslforge" version="0.1.9.9" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion lslforge/eclipse/lslforge-win32-x86/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
6 changes: 3 additions & 3 deletions lslforge/eclipse/lslforge-win32-x86/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: lslforge_win32_x86 Fragment
Bundle-SymbolicName: lslforge_win32_x86
Bundle-Version: 0.1.9.8
Fragment-Host: lslforge;bundle-version="0.1.9.8"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Version: 0.1.9.9
Fragment-Host: lslforge;bundle-version="0.1.9.9"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: lslforge_win32_x86
18 changes: 13 additions & 5 deletions lslforge/eclipse/lslforge/.classpath
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="antlr-3.4-complete-no-antlrv2.jar"/>
<classpathentry kind="lib" path="xstream-1.4.9.jar" sourcepath="xstream-1.4.9-sources.jar"/>
<classpathentry kind="lib" path="xmlpull-1.1.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/Users/summerlight/Projects/LSLForge/lslforge/lslforge/eclipse/lslforge/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="lib" path="/Users/summerlight/Projects/LSLForge/lslforge/lslforge/eclipse/lslforge/xstream-1.4.18.jar" sourcepath="xstream-distribution-1.4.18-src.zip"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/eclipse/core/internal/resources/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="lib" path="antlr-3.5.2-complete-no-st3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Loading

0 comments on commit bf62106

Please sign in to comment.