Skip to content

Commit 2ba9ca2

Browse files
committed
added new API dependencies
updated README
1 parent b299caa commit 2ba9ca2

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
!README.md
55
!Utility.bat
66
!*.cer
7-
!DEPENDENCIES
7+
!DEPENDENCIES
8+
LICENSE

DEPENDENCIES

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ file:alarmmanager-api-addon:modules\alarmmanager
44
file:bacnet-api-core:bin\lib
55
file:directaccess-api-addon:modules\directaccess
66
file:webaccess-api-addon:modules\webaccess
7-
file:xdatabase-api-addon:modules\xdatabase
7+
file:xdatabase-api-addon:modules\xdatabase
8+
file:datatable-api-addon:modules\datatable
9+
file:logicbuilder-api-addon:modules\logicbuilder
10+
file:semantics-api-addon:modules\semantics

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ WebCTRL is a trademark of Automated Logic Corporation. Any other trademarks men
2323

2424
## Setup Instructions
2525

26-
1. Install *WebCTRL8.5* or later.
26+
1. Install *WebCTRL9.0* or later.
2727

2828
2. Install the most recent [*JDK*](https://jdk.java.net/) release.
2929
- Download the *.zip* file, unpack it, and move the contents to your program files.
30-
- Set the `JAVA_HOME` environment variable to the JDK installation directory (e.g, *C:\Program Files\Java\jdk-22.0.1*).
30+
- Set the `JAVA_HOME` environment variable to the JDK installation directory (e.g, *C:\Program Files\Java\jdk-24*).
3131

3232
3. Install [*Visual Studio Code*](https://code.visualstudio.com/) and the following extensions:
3333

@@ -61,7 +61,7 @@ WebCTRL is a trademark of Automated Logic Corporation. Any other trademarks men
6161

6262
- You can initialize preexisting project folders. For example, you could clone a remote repository to your local machine, and then initialize it with the script to generate missing files.
6363

64-
6. Review documentation at [*ALCshare*](http://alcshare.com/content/add-ons).
64+
6. Review API documentation at [*ALCshare*](http://alcshare.com/content/add-ons).
6565

6666
## Command Reference
6767

@@ -132,10 +132,13 @@ Runtime dependencies are located in *./lib* relative to your local clone of this
132132
| [*tomcat-embed-core*](https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api) | *./webserver/lib* |
133133
| [*addonsupport-api-addon*](http://repo.alcshare.com/com/controlj/green/addonsupport-api-addon/) | *./modules/addonsupport* |
134134
| [*alarmmanager-api-addon*](http://repo.alcshare.com/com/controlj/green/alarmmanager-api-addon/) | *./modules/alarmmanager* |
135-
| [*bacnet-api-addon*](http://repo.alcshare.com/com/controlj/green/bacnet-api-addon/) | *./bin/lib* |
135+
| [*bacnet-api-core*](http://repo.alcshare.com/com/controlj/green/bacnet-api-addon/) | *./bin/lib* |
136136
| [*directaccess-api-addon*](http://repo.alcshare.com/com/controlj/green/directaccess-api-addon/) | *./modules/directaccess* |
137137
| [*webaccess-api-addon*](http://repo.alcshare.com/com/controlj/green/webaccess-api-addon/) | *./modules/webaccess* |
138138
| [*xdatabase-api-addon*](http://repo.alcshare.com/com/controlj/green/xdatabase-api-addon/) | *./modules/xdatabase* |
139+
| *datatable-api-addon* | *./modules/datatable* |
140+
| *logicbuilder-api-addon* | *./modules/logicbuilder* |
141+
| *semantics-api-addon* | *./modules/semantics* |
139142

140143
Feel free to browse your *WebCTRL* installation for dependencies that give access to other internal APIs if these defaults are insufficient. If you would like to add a *WebCTRL* API to one project folder without affecting any other projects, the *.jar* file should be placed in *./lib* relative to your project folder.
141144

@@ -155,8 +158,8 @@ url:commons-compiler:https://repo1.maven.org/maven2/org/codehaus/janino/commons-
155158
file:spring-context:bin\lib
156159
file:javax.activation:bin\lib
157160
file:core-api:modules\core
158-
url:CommissioningScripts-0.1.1.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1.jar
159-
url:CommissioningScripts-0.1.1-sources.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1-sources.jar
161+
url:jsch-0.2.24.jar:https://repo1.maven.org/maven2/com/github/mwiede/jsch/0.2.24/jsch-0.2.24.jar
162+
url:jsch-0.2.24-sources.jar:https://repo1.maven.org/maven2/com/github/mwiede/jsch/0.2.24/jsch-0.2.24-sources.jar
160163
```
161164

162165
The general format is `scheme:identifier:location`. For files, the location is a relative path to the folder in your *WebCTRL* installation which contains the dependency. For urls, the location is a direct download link. The identifier should be the first part of the dependency's filename (excluding the version). Dependency filenames are generally expected to match the regular expression `^identifier-\d.*\.jar$`. Alternatively, the identifier may be an exact match to the filename (including the *.jar* extension).
@@ -177,6 +180,7 @@ The generated 2048-bit RSA key-pair is valid for 100 years, uses SHA512 as the s
177180
| 8.0 | 11 |
178181
| 8.5 | 11 |
179182
| 9.0 | 17 |
183+
| 10.0 | 21 |
180184

181185
## Known Issues
182186

Utility.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if "%1" EQU "--goto" (
4646
setlocal EnableDelayedExpansion
4747

4848
:: Version control
49-
set "version=1.1.6"
49+
set "version=1.1.7"
5050
if "%1" EQU "--version" (
5151
echo %version%
5252
exit /b
@@ -436,7 +436,7 @@ exit /b
436436
rmdir /Q /S "%classes%" >nul 2>nul
437437
for /D %%i in ("%trackingClasses%\*") do robocopy /E "%%~fi" "%classes%" >nul 2>nul
438438
robocopy /E "%src%" "%classes%" /XF "*.java" >nul 2>nul
439-
copy /Y "%workspace%\LICENSE" "%root%\LICENSE" >nul 2>nul
439+
if exist "%workspace%\LICENSE" copy /Y "%workspace%\LICENSE" "%root%\LICENSE" >nul 2>nul
440440
robocopy /MIR /MOVE "%lib%" "%workspace%\lib-sources" *-sources.jar >nul 2>nul
441441
"%JDKBin%\jar.exe" -c -M -f "%addonFile%" -C "%root%" .
442442
if %ERRORLEVEL% EQU 0 (
@@ -842,7 +842,7 @@ exit /b
842842
) > "%workspace%\.gitignore"
843843

844844
:: License
845-
if not exist "%workspace%\LICENSE" (
845+
if not exist "%workspace%\LICENSE" if "%nolicense%" EQU "" (
846846
copy /Y "%license%" "%workspace%\LICENSE" >nul
847847
)
848848

0 commit comments

Comments
 (0)