Skip to content

Commit 72b59a2

Browse files
Added build scripts
1 parent 15b1173 commit 72b59a2

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

BuildScripts/createDeploymentZIP.cpp

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,28 @@ int main(int argc, char* argv[])
328328
std::string sPackageFileOnly = getFileNameFromPath(sPackageFileName);
329329
addEntry(entries, entryNames, sPackageFileOnly, sPackageFileName, "package xml", 0);
330330

331+
bool bAddedServerBinary = false;
332+
#ifndef _WIN32
331333
addEntry(entries, entryNames, "amc_server", sPackageDir + "amc_server", "server binary", makeExternalAttributesForFile(0755));
334+
bAddedServerBinary = true;
335+
#else
336+
if (AMCCommon::CUtils::fileOrPathExistsOnDisk(sPackageDir + "amc_server")) {
337+
addEntry(entries, entryNames, "amc_server", sPackageDir + "amc_server", "server binary", makeExternalAttributesForFile(0755));
338+
bAddedServerBinary = true;
339+
}
340+
#endif
341+
342+
if (!bAddedServerBinary) {
343+
addOptionalEntryFromPackage(entries, entryNames, sPackageDir, "amc_server.exe");
344+
addOptionalEntryFromPackage(entries, entryNames, sPackageDir, "amc_win32.exe");
345+
bAddedServerBinary = AMCCommon::CUtils::fileOrPathExistsOnDisk(sPackageDir + "amc_server.exe") ||
346+
AMCCommon::CUtils::fileOrPathExistsOnDisk(sPackageDir + "amc_win32.exe");
347+
}
348+
349+
if (!bAddedServerBinary)
350+
throw std::runtime_error("missing server binary file");
351+
332352
addRequiredEntryFromPackage(entries, entryNames, sPackageDir, "amc_server.xml", "server configuration");
333-
addOptionalEntryFromPackage(entries, entryNames, sPackageDir, "amc_server.exe");
334-
addOptionalEntryFromPackage(entries, entryNames, sPackageDir, "amc_win32.exe");
335353
addEmptyEntry(entries, entryNames, "data/", makeExternalAttributesForDirectory(0755));
336354
addEmptyEntry(entries, entryNames, "temp/", makeExternalAttributesForDirectory(0755));
337355

BuildScripts/createDevPackage.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,17 @@ int main(int argc, char* argv[])
162162
if (sSystemPrefix == "win64") {
163163
addFileToZip(zipWriter, sDevPackageDir + "buildresources.exe", "buildresources.exe", 0);
164164
addFileToZip(zipWriter, sDevPackageDir + "create_package_xml.exe", "create_package_xml.exe", 0);
165+
addFileToZip(zipWriter, sDevPackageDir + "create_deployment_zip.exe", "create_deployment_zip.exe", 0);
165166
}
166167
else if (sSystemPrefix == "linux64") {
167168
addFileToZip(zipWriter, sDevPackageDir + "buildresources.linux64", "buildresources.linux64", getExternalAttributesForFile(sDevPackageDir + "buildresources.linux64"));
168169
addFileToZip(zipWriter, sDevPackageDir + "create_package_xml", "create_package_xml", getExternalAttributesForFile(sDevPackageDir + "create_package_xml"));
170+
addFileToZip(zipWriter, sDevPackageDir + "create_deployment_zip", "create_deployment_zip", getExternalAttributesForFile(sDevPackageDir + "create_deployment_zip"));
169171
}
170172
else if (sSystemPrefix == "rpi") {
171173
addFileToZip(zipWriter, sDevPackageDir + "buildresources.rpi", "buildresources.rpi", getExternalAttributesForFile(sDevPackageDir + "buildresources.rpi"));
172174
addFileToZip(zipWriter, sDevPackageDir + "create_package_xml", "create_package_xml", getExternalAttributesForFile(sDevPackageDir + "create_package_xml"));
175+
addFileToZip(zipWriter, sDevPackageDir + "create_deployment_zip", "create_deployment_zip", getExternalAttributesForFile(sDevPackageDir + "create_deployment_zip"));
173176
}
174177
else {
175178
throw std::runtime_error("Invalid system prefix: " + sSystemPrefix);

0 commit comments

Comments
 (0)