Skip to content

Default to the directory of fetch_external_sources.py instead of CWD #33

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: dev
Choose a base branch
from
Open

Default to the directory of fetch_external_sources.py instead of CWD #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ae6ef
Remove un-Pythonic semicolons
nhaehnle Jan 28, 2023
86580cd
Default to the directory of fetch_external_sources.py instead of CWD
nhaehnle Jan 28, 2023
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
48 changes: 25 additions & 23 deletions external/fetch_external_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@

import sys
import os
import os.path
import string

from optparse import OptionParser

TargetDir = os.getcwd() + "/"; # target directory the source code downloaded to.
# Target directory the source code downloaded to by default.
TargetDir = os.path.dirname(os.path.abspath(__file__))

class GitRepo:
def __init__(self, httpsUrl, moduleName, defaultRevision, extractDir):
Expand All @@ -49,36 +51,36 @@ def __init__(self, httpsUrl, moduleName, defaultRevision, extractDir):
def GetRevision(self):
SrcFile = TargetDir + "../CHANGES";
if not os.path.exists(SrcFile):
print(SrcFile + " does not exist, default revision is " + self.revision);
return;
print(SrcFile + " does not exist, default revision is " + self.revision)
return

revFile = open(SrcFile,'r');
lines = revFile.readlines();
revFile = open(SrcFile,'r')
lines = revFile.readlines()
found = False;
for line in lines:
if (found == True):
if (line.find("Commit:") == 0):
self.revision = line[7:];
break;
self.revision = line[7:]
break
if (self.moduleName.lower() in line.lower()):
found = True;
found = True
else:
found = False;
revFile.close();
found = False
revFile.close()

if (found == False):
print("Warning: Revision is not gotten from " + SrcFile + " correctly, please check it!!!")
else:
print("Get the revision of " + self.extractDir + ": " + self.revision);
print("Get the revision of " + self.extractDir + ": " + self.revision)

def CheckOut(self):
fullDstPath = os.path.join(TargetDir, self.extractDir)
if not os.path.exists(fullDstPath):
os.system("git clone " + self.httpsUrl + " " + fullDstPath);
os.system("git clone " + self.httpsUrl + " " + fullDstPath)

os.chdir(fullDstPath);
os.system("git fetch");
os.system("git checkout " + self.revision);
os.chdir(fullDstPath)
os.system("git fetch")
os.system("git checkout " + self.revision)

PACKAGES = [
GitRepo("https://github.com/KhronosGroup/glslang.git", "glslang", "980ac508", "glslang"),
Expand All @@ -88,7 +90,7 @@ def CheckOut(self):
]

def GetOpt():
global TargetDir;
global TargetDir

parser = OptionParser()

Expand All @@ -100,15 +102,15 @@ def GetOpt():
(options, args) = parser.parse_args()

if options.targetdir:
print("The source code is downloaded to %s" % (options.targetdir));
TargetDir = options.targetdir;
print("The source code is downloaded to %s" % (options.targetdir))
TargetDir = options.targetdir
else:
print("The target directory is not specified, using default: " + TargetDir);
print("The target directory is not specified, using default: " + TargetDir)

def DownloadSourceCode():
global TargetDir;
global TargetDir

os.chdir(TargetDir);
os.chdir(TargetDir)

# Touch the spvgen CMakeLists.txt to ensure that the new directories get used.
os.utime('../CMakeLists.txt', None)
Expand All @@ -117,5 +119,5 @@ def DownloadSourceCode():
pkg.GetRevision()
pkg.CheckOut()

GetOpt();
DownloadSourceCode();
GetOpt()
DownloadSourceCode()