Skip to content

Commit 8c48dc6

Browse files
authored
Merge pull request #69 from alexanderoster/master
Upstream merges (#28)
2 parents 476b8e1 + f6fb339 commit 8c48dc6

File tree

872 files changed

+259274
-28289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

872 files changed

+259274
-28289
lines changed

.github/workflows/build-and-test.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Build and Test
2+
3+
on:
4+
push:
5+
branches: [ master, develop ]
6+
pull_request:
7+
branches: [ master, develop ]
8+
9+
jobs:
10+
build-and-test:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
17+
- name: Show current Git branch
18+
run: git branch --show-current
19+
20+
- name: Install dependencies
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install -y gcc g++ cmake golang uuid-dev
24+
25+
- name: Run pre-build script
26+
run: |
27+
chmod +x ./build_clean_linux64.sh
28+
./build_clean_linux64.sh
29+
shell: bash
30+
31+
- name: Run unit tests
32+
run: ./build_linux64/Output/amc_unittest

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,12 @@
4343
[submodule "submodules/libjpeg-turbo"]
4444
path = submodules/libjpeg-turbo
4545
url = https://github.com/libjpeg-turbo/libjpeg-turbo.git
46+
[submodule "submodules/TinyJPEG"]
47+
path = submodules/TinyJPEG
48+
url = https://github.com/serge-rgb/TinyJPEG.git
49+
[submodule "submodules/stb"]
50+
path = submodules/stb
51+
url = https://github.com/nothings/stb.git
52+
[submodule "submodules/swagger-ui"]
53+
path = submodules/swagger-ui
54+
url = https://github.com/swagger-api/swagger-ui.git

ACT/LibMC.xml

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,50 @@
658658
<error name="INVALIDCONTENTSTATEID" code="632" description="Invalid content state ID" />
659659
<error name="INVALIDWIDGETREQUEST" code="633" description="Invalid widget request" />
660660
<error name="SOURCEVARIABLENOTFOUND" code="634" description="Source variable not found" />
661-
662-
663-
664-
661+
<error name="INVALIDEVENTRETURNVALUES" code="635" description="Invalid event return values" />
662+
<error name="INVALIDMODIFIERINTERPOLATIONCOUNT" code="636" description="Invalid modifier interpolation count" />
663+
<error name="INVALIDTOOLPATHMODIFIERTYPE" code="637" description="Invalid toolpath modifier type." />
664+
<error name="INVALIDTOOLPATHMODIFIERFACTOR" code="638" description="Invalid toolpath modifier factor." />
665+
<error name="BINARYMETADATARELATIONSHIPNOTFOUND" code="639" description="Binary metadata relationship not found." />
666+
<error name="ENVIRONMENTVARIABLECHANGEAFTERSTART" code="640" description="Environment variable change after start." />
667+
<error name="INVALIDENVIRONMENTVARIABLENAME" code="641" description="Invalid environment variable name." />
668+
<error name="ENVIRONMENTVARIABLEALREADYEXISTS" code="642" description="Environment variable already exists." />
669+
<error name="REACHEDENVIRONMENTVARIABLELIMIT" code="643" description="Reached Environment variable limit." />
670+
<error name="ENVIRONMENTVARIABLENOTFOUND" code="644" description="Environment Variable not found." />
671+
<error name="INVALIDENVIRONMENTVARIABLEINDEX" code="645" description="Invalid environment variable index." />
672+
<error name="COULDNOTREADPROCESSPIPE" code="646" description="Could not read process pipe." />
673+
<error name="PROCESSEXECUTABLENOTFOUND" code="647" description="Process executable not found." />
674+
<error name="COULDNOTCREATEPROCESSPIPE" code="648" description="Could not create process pipe." />
675+
<error name="CREATEPROCESSFAILED" code="649" description="Create process failed." />
676+
<error name="PROCESSEXECUTABLEDIRECTORYDOESNOTEXIST" code="650" description="Process executable directory does not exist." />
677+
<error name="PROCESSCONTROLTIMEISINVALID" code="651" description="Process control time is invalid." />
678+
<error name="PROCESSWORKINGDIRECTORYDOESNOTEXIST" code="652" description="Process working directory does not exist." />
679+
<error name="PROCESSHASALREADYBEENSTARTED" code="653" description="Process has already been started." />
680+
<error name="PROCESSHANDLINGNOTIMPLEMENTEDONPLATFORM" code="654" description="Process handling not implemented on Platform." />
681+
<error name="INVALIDWRITEBUFFFERPOSITION" code="655" description="Invalid write buffer position." />
682+
<error name="INVALIDWRITEBUFFERSIZE" code="656" description="Invalid write buffer size." />
683+
<error name="CANNOTWRITETOFINISHEDFILE" code="658" description="Cannot write to finished file." />
684+
<error name="WORKINGDIRECTORYHASBEENCLEANED" code="659" description="Working Directory has been cleaned." />
685+
<error name="INVALIDCHARACTERINFILENAME" code="660" description="Invalid character in filename." />
686+
<error name="WORKINGDIRECTORYCEASEDTOEXIST" code="661" description="Working directory ceased to exist." />
687+
<error name="DIRECTORYALREADYEXISTS" code="662" description="Directory already exists." />
688+
<error name="WORKINGDIRECTORYNOTFOUND" code="663" description="Working Directory not found." />
689+
<error name="INVALIDSIGNALREACTIONTIMEOUT" code="664" description="Invalid Signal Reaction Timeout." />
690+
<error name="INVALIDSIGNALQUEUESIZE" code="665" description="Invalid Signal queue size." />
691+
<error name="SIGNALALREADYTRIGGERED" code="666" description="Signal has already been triggered." />
692+
<error name="INVALIDQUERYPARAMETER" code="667" description="Invalid query parameter." />
693+
<error name="DUPLICATEQUERYPARAMETER" code="668" description="Duplicate query parameter." />
694+
<error name="QUERYPARAMETERNOTFOUND" code="669" description="Query parameter not found." />
695+
<error name="INVALIDBUILDJOBSTATUSQUERY" code="670" description="Invalid build job status query." />
696+
<error name="INVALIDNEWBUILDSTATUS" code="671" description="Invalid new build status." />
697+
<error name="INVALIDDEFAULTOPENAPIJSON" code="672" description="Invalid Default OpenAPI JSON." />
698+
<error name="INVALIDCUSTOMOPENAPIJSON" code="673" description="Invalid Custom OpenAPI JSON." />
699+
<error name="USEDMODULEISLEGACY" code="674" description="Used module is legacy." />
700+
<error name="TRIEDTOACCESSNULLCLIENTPARAMETERS" code="675" description="Tried to access null client parameters." />
701+
<error name="INVALIDFRONTENDMODULEPATH" code="676" description="Invalid frontend module path." />
702+
<error name="INVALIDFRONTENDATTRIBUTENAME" code="677" description="Invalid frontend attribute name." />
703+
<error name="DUPLICATEFRONTENDATTRIBUTENAME" code="678" description="Duplicate frontend attribute name." />
704+
665705
</errors>
666706

667707

@@ -682,6 +722,10 @@
682722
<option name="Testing" value="3"/>
683723
</enum>
684724

725+
<enum name="StreamConnectionType">
726+
<option name="JSONEventStream" value="1"/>
727+
<option name="JPEGImageStream" value="2"/>
728+
</enum>
685729

686730
<class name="Base">
687731

@@ -712,6 +756,10 @@
712756
<param name="IdleDelay" type="uint32" pass="return" description="Idle Delay." />
713757
</method>
714758

759+
<method name="GetStreamType" description="Returns the stream type.">
760+
<param name="StreamType" type="enum" class="StreamConnectionType" pass="return" description="Content type of the stream." />
761+
</method>
762+
715763
</class>
716764

717765

@@ -744,6 +792,12 @@
744792
<param name="Name" type="string" pass="in" description="Name of the form data field." />
745793
<param name="String" type="string" pass="in" description="DataString that was sent." />
746794
</method>
795+
796+
<method name="SetRequestParameter" description="Sets a request parameter.">
797+
<param name="Name" type="string" pass="in" description="Name of the parameter." />
798+
<param name="Value" type="string" pass="in" description="Value of the parameter." />
799+
</method>
800+
747801

748802
<method name="Handle" description="handles the request.">
749803
<param name="RawBody" type="basicarray" class="uint8" pass="in" description="Raw Body that was sent. Only necessary, if ExpectsRawBody returns true." />
@@ -808,6 +862,10 @@
808862
<param name="ResourcePath" type="string" pass="in" description="Path to the resource package." />
809863
</method>
810864

865+
<method name="LoadAPIDocumentation" description="load a package to serve the API documentation website.">
866+
<param name="ResourcePath" type="string" pass="in" description="Path to the resource package." />
867+
</method>
868+
811869

812870
<method name="Log" description="log message with a certain log level.">
813871
<param name="Message" type="string" pass="in" description="log message" />

0 commit comments

Comments
 (0)