Skip to content

Commit 06e93ae

Browse files
authored
0.7.5.2 hotfix (#503)
* Close #500 * rename pbos with prefix
1 parent 867e252 commit 06e93ae

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

SConstruct

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ def getPboInfo(settings):
4949
pboInfo.name = name
5050
pboInfo.folder = os.path.join(settings["addonsFolder"], name)
5151
pboInfo.outputPath = pboInfo.folder + ".pbo"
52+
pboInfo.builtpath = os.path.join(settings["outputFolder"], name + ".pbo")
53+
pboInfo.filename = "hct_h60_" + name + ".pbo"
54+
pboInfo.filepath = os.path.join(settings["outputFolder"], pboInfo.filename)
5255
with open(os.path.join(pboInfo.folder,"$PBOPREFIX$"), "r") as file:
5356
pboInfo.pboPrefix = file.readline().strip()
5457
try:
@@ -85,8 +88,10 @@ def buildSymlink(pathFrom, pathTo):
8588
def buildPbo(settings,env, pbo):
8689
optBinarize = "-binarize=C:\\Windows\\System32\\print.exe" if pbo.name in settings["noBinarize"] else ""
8790
cfgConvertArg = "-cfgconvert=asdfafds" # + a3toolsPath() + "\\CfgConvert\\CfgConvert.exe"
88-
env.Command(pbo.outputPath, allFilesIn(pbo.folder)+["build"],
89-
f'"{addonBuilderPath()}" "{os.path.abspath(pbo.buildSymlink)}" "{os.path.abspath(settings["outputFolder"])}" "-project=build" "-prefix={pbo.pboPrefix}" -include=tools\\buildExtIncludes.txt {optBinarize}')
91+
env.Command(pbo.outputPath, allFilesIn(pbo.folder)+["build"],[
92+
f'"{addonBuilderPath()}" "{os.path.abspath(pbo.buildSymlink)}" "{os.path.abspath(settings["outputFolder"])}" "-project=build" "-prefix={pbo.pboPrefix}" -include=tools\\buildExtIncludes.txt {optBinarize}',
93+
Move(os.path.abspath(settings["outputFolder"]) + "/" + pbo.filename, os.path.abspath(pbo.builtpath))
94+
])
9095
targetDefinition(pbo.name, f"Build the {pbo.name} pbo.")
9196
return env.Alias(pbo.name, pbo.outputPath)
9297

@@ -113,7 +118,7 @@ allPbos = env.Alias("all", pboAliases)
113118
targetDefinition("all", "Build all pbos.")
114119

115120
buildDocs = env.Command(r"docs\index.html",
116-
[s for s in allFilesIn(settings["addonsFolder"]) if s.endswith(".sqf")] + [r"buildTools\Natural Docs"],
121+
[s for s in allFilesIn(settings["addonsFolder"]) if s.endswith(".sqf")] + [r"buildTools\Natural Docs"],
117122
[Mkdir("docs"), r'"buildTools\Natural Docs\NaturalDocs.exe" naturaldocs'])
118123
env.AlwaysBuild(buildDocs)
119124

@@ -139,4 +144,4 @@ except Exception as e:
139144
print(e)
140145
print("Error: Couldn't find arma 3, cannot make or remove symlinks")
141146

142-
env.Default("all")
147+
env.Default("all")

0 commit comments

Comments
 (0)