luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-28 17:06:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wip

Browse Source
This commit is contained in:
Matthias Koefferlein
2024-01-06 17:28:51 +01:00
parent 2b4a583f05 4e20e78995
commit 0ae2ed49f8
14 changed files with 257 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/deploy-win-mingw.sh
+3 -3
View File
@@ -101,8 +101,8 @@ else
echo "ERROR: not in mingw32 or mingw64 system."
fi
target=$pwd/bin-release-$arch
build=$pwd/build-release-$arch
target=$pwd/bin-release-$arch$KLAYOUT_BUILD_SUFFIX
build=$pwd/build-release-$arch$KLAYOUT_BUILD_SUFFIX
src=$pwd/src
scripts=$pwd/scripts
# Update in NSIS script too:
@@ -284,7 +284,7 @@ echo "Making .zip file $zipname.zip .."
rm -rf $zipname $zipname.zip
mkdir $zipname
cp -Rv *.dll cert.pem .*-paths.txt db_plugins lay_plugins pymod $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
cp -Rv strm*.exe *.dll cert.pem .*-paths.txt db_plugins lay_plugins pymod $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
cp klayout.exe $zipname/klayout_app.exe
cp klayout.exe $zipname/klayout_vo_app.exe
echo ""
scripts/deploy-win-ucrt64.sh
+3 -3
View File
@@ -94,8 +94,8 @@ else
echo "ERROR: not in ucrt64 system."
fi
target=$pwd/bin-release-$arch
build=$pwd/build-release-$arch
target=$pwd/bin-release-$arch$KLAYOUT_BUILD_SUFFIX
build=$pwd/build-release-$arch$KLAYOUT_BUILD_SUFFIX
src=$pwd/src
scripts=$pwd/scripts
# Update in NSIS script too:
@@ -292,7 +292,7 @@ echo "Making .zip file $zipname.zip .."
rm -rf $zipname $zipname.zip
mkdir $zipname
cp -Rv *.dll cert.pem .*-paths.txt db_plugins lay_plugins $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
cp -Rv strm*.exe *.dll cert.pem .*-paths.txt db_plugins lay_plugins $plugins lib $zipname | sed -u 's/.*/echo -n ./' | sh
cp klayout.exe $zipname/klayout_app.exe
cp klayout.exe $zipname/klayout_vo_app.exe
echo ""
scripts/rpm-data/klayout.spec
+36 -24
View File
@@ -1,19 +1,6 @@
#
# spec file for package klayout
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: klayout
Version: %{git_version}
@@ -31,10 +18,32 @@ Source0: http://www.klayout.de/downloads/%{name}-%{version}.tar.gz
# so's of klayout itself)
AutoReqProv: no
# RockyLinux9 requirements
%if "%{target_system}" == "rockylinux9"
Requires: ruby >= 3.0.0
Requires: python3 >= 3.9.0
Requires: qt5-qtbase >= 5.15.9
Requires: qt5-qtmultimedia >= 5.15.9
Requires: qt5-qtxmlpatterns >= 5.15.9
Requires: qt5-qtsvg >= 5.15.9
Requires: qt5-qttools >= 5.15.9
# NOTE: this package is required for libQt5Designer and pulls in a lot of devel stuff.
# Maybe it's worth considering to drop designer support and replace by QUiLoader.
Requires: qt5-qttools-devel >= 5.15.9
# Needed by something else (still?)
Requires: http-parser >= 2.9.4
%define buildopt -j2
# libgit2 is not available as standard package, but through EPEL
# So we include it explicitly
%define copylibs /usr/lib64/libgit2.so*
%define __python /usr/bin/python3
%endif
# CentOS8 requirements
%if "%{target_system}" == "centos8"
Requires: ruby >= 2.5.5
Requires: python3 >= 3.6.0
Requires: ruby >= 2.5.5
Requires: python3 >= 3.6.0
Requires: libgit2 >= 0.26.8
Requires: qt5-qtbase >= 5.11.1
Requires: qt5-qtmultimedia >= 5.11.1
@@ -51,8 +60,8 @@ Requires: qt5-qttools-devel >= 5.11.1
# CentOS7 requirements
%if "%{target_system}" == "centos7"
Requires: ruby >= 2.0.0
Requires: python3 >= 3.6.0
Requires: ruby >= 2.0.0
Requires: python3 >= 3.6.0
Requires: qt-x11 >= 4.8.5
Requires: libgit2 >= 0.26.8
%define buildopt -j2
@@ -69,25 +78,25 @@ Requires: qt-x11 >= 4.6.2
%if "%{target_system}" == "opensuse42_2"
# OpenSuSE 42.2 requirements
Requires: ruby2.3 >= 2.3.1
Requires: python3 >= 3.4.6
Requires: ruby2.3 >= 2.3.1
Requires: python3 >= 3.4.6
Requires: libqt4-x11 >= 4.8.6
%define buildopt -j2 -nolibgit2
%endif
%if "%{target_system}" == "opensuse42_3"
# OpenSuSE 42.3 requirements
Requires: ruby2.3 >= 2.3.1
Requires: python3 >= 3.4.6
Requires: ruby2.3 >= 2.3.1
Requires: python3 >= 3.4.6
Requires: libqt4-x11 >= 4.8.6
%define buildopt -j2 -nolibgit2
%endif
%if "%{target_system}" == "opensuse15"
# OpenSuSE Leap 15 requirements
Requires: ruby >= 2.5
Requires: python3 >= 3.6
Requires: libgit2-1_3 >= 1.3.0
Requires: ruby >= 2.5
Requires: python3 >= 3.6
Requires: libgit2-1_3 >= 1.3.0
Requires: libqt5-qtbase >= 5.15.2
Requires: libQt5PrintSupport5 >= 5.15.2
Requires: libQt5Designer5 >= 5.15.2
@@ -151,6 +160,9 @@ cp -pd %{_builddir}/bin.$TARGET/lib*.so* %{buildroot}%{_libdir}/klayout
cp -pd %{_builddir}/bin.$TARGET/db_plugins/lib*.so* %{buildroot}%{_libdir}/klayout/db_plugins
cp -pd %{_builddir}/bin.$TARGET/lay_plugins/lib*.so* %{buildroot}%{_libdir}/klayout/lay_plugins
cp -rpd %{_builddir}/bin.$TARGET/pymod/* %{buildroot}%{_libdir}/klayout/pymod
%if %{defined copylibs}
cp -pd %{copylibs} %{buildroot}%{_libdir}/klayout
%endif
chmod 644 %{buildroot}%{_libdir}/klayout/*.so*
chmod 644 %{buildroot}%{_libdir}/klayout/db_plugins/*.so*
chmod 644 %{buildroot}%{_libdir}/klayout/lay_plugins/*.so*