Skip to content

Update build_conquest_python.py (NO_JIRA) #20

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

Merged
merged 4 commits into from
Mar 27, 2025
Merged

Update build_conquest_python.py (NO_JIRA) #20

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
200dead
Update build_conquest_python.py (NO_JIRA)
jasonccole Mar 27, 2025
fa3ed02
Update build_conquest_python.py
jasonccole Mar 27, 2025
7183ec5
Update build_conquest_python.py (NO_JIRA)
jasonccole Mar 27, 2025
35c8593
Update jpeg package to the one now available (NO_JIRA)
jasonccole Mar 27, 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
24 changes: 11 additions & 13 deletions build_conquest_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,15 @@ def source_archives(self):
def extract_source_archives(self):
super().extract_source_archives()
# Remove packages we don't want to build
shutil.rmtree(self.main_source_directory_path /
'pkgs' / 'sqlite3.34.0')
shutil.rmtree(self.main_source_directory_path / 'pkgs' / 'tdbc1.1.2')
shutil.rmtree(self.main_source_directory_path /
'pkgs' / 'tdbcmysql1.1.2')
shutil.rmtree(self.main_source_directory_path /
'pkgs' / 'tdbcodbc1.1.2')
shutil.rmtree(self.main_source_directory_path /
'pkgs' / 'tdbcpostgres1.1.2')
shutil.rmtree(self.main_source_directory_path /
'pkgs' / 'tdbcsqlite3-1.1.2')
sp = Path(self.main_source_directory_path / 'pkgs')

sqlite_path = sp.glob('sqlite*')
for file in sqlite_path:
shutil.rmtree(file)

tbc_path = sp.glob('tdbc*')
for file in tbc_path:
shutil.rmtree(file)

@property
def main_source_directory_path(self):
Expand Down Expand Up @@ -509,12 +507,12 @@ def arguments_to_configuration_script(self):

class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixin, Package):
name = 'jpeg'
version = '9e'
version = '9f'

@property
def source_archives(self):
return {
f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v9e.tar.gz'
f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
}


Expand Down