Skip to content

Handle path determination seperately for AS412 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle path determination seperately for AS412 #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df841d7
Handle path determination seperately for AS412
Feb 13, 2025
a3a51c7
Refactor ASPath handling
Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions ASTools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,20 @@
28341: 'Transfer to the corresponding target system is not possible since the AR version on the target system does not yet support the transfer mode'
}

def getASBasePath(version: str) -> str:
return 'C:\\Program Files\\BRAutomation4' if version == 'AS412' else 'C:\\BrAutomation'

def getASPath(version:str) -> str:
base = "C:\\BrAutomation"
if version.lower() == 'base':
return base
else:
return os.path.join(base, version.upper(), 'Bin-en')
return os.path.join(getASBasePath(version), version.upper(), 'Bin-en')

def getASBuildPath(version:str) -> str:
if version.lower() == 'base':
return getASPath('base')
else:
return os.path.join(getASPath(version), "BR.AS.Build.exe")
return os.path.join(getASPath(version), "BR.AS.Build.exe")

def getPVITransferPath(version:str) -> str:
base = getASPath('base')
return os.path.join(base, 'PVI', version, 'PVI', 'Tools', 'PVITransfer')
base = getASBasePath(version)
pviVersion = version.replace('AS','',1)
pviVersion = 'V' + pviVersion[:1] + '.' + pviVersion[1:]
return os.path.join(base, 'PVI', pviVersion, 'PVI', 'Tools', 'PVITransfer')

def ASProjetGetConfigs(project: str) -> [str]:

Expand Down Expand Up @@ -799,10 +797,6 @@ def build(self, *configNames, buildMode='Build', buildRUCPackage=True, tempPath=
def createPIP(self, configName, destination):
logging.info(f'Creating PIP at {destination}')

# ASVersion is in the format AS45, whereas PVIVersion needs to be in the format V4.5.
pviVersion = self.ASVersion.replace('AS','',1)
pviVersion = 'V' + pviVersion[:1] + '.' + pviVersion[1:]

# Retrieve the configuration object based on the name.
config = self.getConfigByName(configName)

Expand All @@ -818,7 +812,7 @@ def createPIP(self, configName, destination):

# Call PVITransfer.exe to run the .pil script that was just created.
arguments = []
arguments.append(os.path.join(getPVITransferPath(pviVersion), 'PVITransfer.exe'))
arguments.append(os.path.join(getPVITransferPath(self.ASVersion), 'PVITransfer.exe'))
arguments.append('-automatic') # bypass GUI prompts
arguments.append('-silent') # don't show GUI at all
arguments.append(RUCPilPath)
Expand All @@ -840,11 +834,9 @@ def createArsim(self, *configNames, startSim = False):
return self.createSim(configNames, startSim=startSim)

def createSim(self, *configNames, destination, startSim = False):
pviVersion = self.ASVersion.replace('AS','',1)
pviVersion = 'V' + pviVersion[:1] + '.' + pviVersion[1:]
for configName in configNames:
config = self.getConfigByName(configName)
CreateARSimStructure(os.path.join(self.binaryPath, config.name, config.hardware, 'RUCPackage', 'RUCPackage.zip'), destination, pviVersion, startSim=startSim)
CreateARSimStructure(os.path.join(self.binaryPath, config.name, config.hardware, 'RUCPackage', 'RUCPackage.zip'), destination, self.ASVersion, startSim=startSim)
pass

def startSim(self, configName:str, build=False):
Expand Down