Skip to content

Commit 529515b

Browse files
authored
Mac port for windows only functionality (#187)
* add buildimplementationjs.go to the list of sources mac * fixes for mac port * controversial lowercase enum values' * just a trial * class as template parameter to cache * dont reload script library? * add check back in * oops * revert lowercase enums and trimmed description
1 parent bd71cbd commit 529515b

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

Build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ startingpath="$(pwd)"
66
basepath="$(cd "$(dirname "$0")" && pwd)"
77
cd "$basepath/../Source"
88

9-
Sources="actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingccppdocumentation.go buildbindingcsharp.go buildbindinggo.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildbindingjava.go buildimplementationcpp.go buildimplementationpascal.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go"
9+
Sources="actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingccppdocumentation.go buildbindingcsharp.go buildbindinggo.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildbindingjava.go buildimplementationcpp.go buildimplementationpascal.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go buildimplementationjs.go"
1010

1111
echo "Build act.win64.exe"
1212
export GOARCH="amd64"

Source/buildimplementationcpp.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ func buildCPPInternalException(wHeader LanguageWriter, wImpl LanguageWriter, Nam
196196
wHeader.Writeln("#define __%s_INTERFACEEXCEPTION_HEADER", strings.ToUpper(NameSpace));
197197
wHeader.Writeln("");
198198

199+
wHeader.Writeln("#include <string>");
199200
wHeader.Writeln("#include <exception>");
200201
wHeader.Writeln("#include <stdexcept>");
201202

@@ -912,7 +913,7 @@ func buildOutCacheTemplateParameters (method ComponentDefinitionMethod, NameSpac
912913

913914
cppParamType := getCppParamType(param, NameSpace, true);
914915
if param.ParamType == "class" || param.ParamType == "optionalclass" {
915-
cppParamType = fmt.Sprintf("I%s%s*", ClassIdentifier, BaseClassName)
916+
cppParamType = fmt.Sprintf("I%s%s*", ClassIdentifier, param.ParamClass)
916917
}
917918
result += cppParamType;
918919
}
@@ -1727,7 +1728,7 @@ func generatePrePostCallCPPFunctionCode(component ComponentDefinition, method Co
17271728
case "class", "optionalclass":
17281729
checkInputCode = append(checkInputCode, fmt.Sprintf("if (p%s == nullptr)", param.ParamName))
17291730
checkInputCode = append(checkInputCode, fmt.Sprintf(" throw E%sInterfaceException (%s_ERROR_INVALIDPARAM);", NameSpace, strings.ToUpper(NameSpace)))
1730-
1731+
17311732
paramNameSpace, paramClassName, _ := decomposeParamClassName(param.ParamClass)
17321733
if len(paramNameSpace) > 0 {
17331734
outVarName := fmt.Sprintf("p%s%s", paramNameSpace, param.ParamName)
@@ -1739,10 +1740,10 @@ func generatePrePostCallCPPFunctionCode(component ComponentDefinition, method Co
17391740
callParameters = callParameters + outVarName
17401741
outCallParameters = outCallParameters + outVarName
17411742
} else {
1742-
preCallCode = append(preCallCode, fmt.Sprintf("I%s* pBase%s(nullptr);", paramClassName, param.ParamName))
1743-
postCallCode = append(postCallCode, fmt.Sprintf("*%s = (%s*)(pBase%s);", variableName, IBaseClassName, param.ParamName));
1744-
callParameters = callParameters + "pBase" + param.ParamName
1745-
outCallParameters = outCallParameters + "pBase" + param.ParamName
1743+
preCallCode = append(preCallCode, fmt.Sprintf("I%s* pClass%s(nullptr);", paramClassName, param.ParamName))
1744+
postCallCode = append(postCallCode, fmt.Sprintf("*%s = (%s*)(pClass%s);", variableName, IBaseClassName, param.ParamName));
1745+
callParameters = callParameters + "pClass" + param.ParamName
1746+
outCallParameters = fmt.Sprintf("%s pClass%s", outCallParameters, param.ParamName)
17461747
}
17471748

17481749

Source/buildimplementationjs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func buildJSTypesFiles(component ComponentDefinition, NameSpace string, NameSpac
252252
classdefinitionw.Writeln("namespace v8%s {", NameSpace );
253253
classdefinitionw.Writeln(" namespace %s {", NameSpaceImplementation );
254254
classdefinitionw.Writeln("")
255-
classdefinitionw.Writeln(" _inline void registerInjectionClasses (std::shared_ptr<Cv8objectCreator> pObjectCreator, v8::Local<v8::Object> pTarget)", )
255+
classdefinitionw.Writeln(" inline void registerInjectionClasses (std::shared_ptr<Cv8objectCreator> pObjectCreator, v8::Local<v8::Object> pTarget)", )
256256
classdefinitionw.Writeln(" {")
257257
for _, subComponent := range(component.ImportedComponentDefinitions) {
258258

0 commit comments

Comments
 (0)