Skip to content

Commit 95e45e2

Browse files
FrodeSolheimFrodeSolheim
committed
More fsbuild stuff
1 parent f60f9b8 commit 95e45e2

27 files changed

+257
-212
lines changed

‎ChangeLog

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Version 3.9.101dev:
22

3+
* More FSEMU updates.
34
* SCP floppy image doesn't wrap to revolution #0 cleanly [keirf].
45
* Fixed crash in nname_to_aname [PowderedToastMan].
56
* New option video_driver (can be sdl or null).

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.67])
5-
AC_INIT([FS-UAE], [3.9.100dev],
5+
AC_INIT([FS-UAE], [3.9.101dev],
66
[[email protected]], [fs-uae], [https://fs-uae.net])
77
AC_CONFIG_AUX_DIR([.])
88
AC_CANONICAL_HOST

‎debian/changelog

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
fs-uae (3.9.100~dev-0) unstable; urgency=low
1+
fs-uae (3.9.101~dev-0) unstable; urgency=low
22

33
* Dummy changelog entry.
44

5-
-- Frode Solheim <[email protected]> Fri, 1 Jan 2021 15:12:46 +0100
5+
-- Frode Solheim <[email protected]> Mon, 22 Feb 2021 17:27:30 +0100

‎dist/linux/build.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,22 @@ def wrap(name, target=None, args=None):
8888
# "python3 -m fspy.zipfile deterministic {package_dir}/fs-uae.dat")
8989
s("cp -a ../../fs-uae-device-helper {package_dir}/fs-uae-device-helper")
9090

91-
s("mkdir FS-UAE/Data")
92-
s("cp -a ../../fs-uae.dat FS-UAE/Data/fs-uae.dat")
93-
s("PYTHONPATH=../../../fs-uae-launcher:../../../../fs-uae-launcher "
94-
"python3 -m fspy.zipfile deterministic FS-UAE/Data/fs-uae.dat")
95-
# s("mkdir -p {package_dir}/share")
96-
# s("cp -a ../../share/locale {package_dir}/share/locale")
97-
s("cp -a ../../share/locale FS-UAE/Data/Locale")
98-
# s("mkdir -p {package_dir}/share/fs-uae")
99-
# s("touch {package_dir}/share/fs-uae/share-dir")
91+
# data_dir = "FS-UAE/Data"
92+
data_dir = package_dir
93+
94+
s(f"mkdir -p {data_dir}")
95+
s(f"cp -a ../../fs-uae.dat {data_dir}/fs-uae.dat")
96+
s(f"PYTHONPATH=../../../fs-uae-launcher:../../../../fs-uae-launcher "
97+
f"python3 -m fspy.zipfile deterministic {data_dir}/fs-uae.dat")
98+
s(f"cp -a ../../data/* {data_dir}/")
99+
100+
s(f"cp -a ../../share/locale FS-UAE/Locale")
100101

101102
s("mkdir FS-UAE/Docs")
102103
s("cp -a ../../licenses FS-UAE/Docs/Licenses")
103104
s("cp -a ../../ChangeLog FS-UAE/Docs/ChangeLog.txt")
104105
s("cp -a ../../README FS-UAE/ReadMe.txt")
105106

106-
s("cp -a ../../data/* FS-UAE/Data/")
107-
108107
if os.environ.get("STANDALONE") == "0":
109108
pass
110109
else:
@@ -118,11 +117,12 @@ def wrap(name, target=None, args=None):
118117
wrap("fs-uae")
119118
wrap("fs-uae-device-helper")
120119

121-
# s("cd {package_dir} && tar Jcfv ../../../{package_name}.tar.xz *")
122-
s("tar Jcfv ../../{package_name_2}.tar.xz FS-UAE")
123-
print(package_name_2)
124-
# s("cp ../../{package_name_2}.tar.xz ../../{package_name}.tar.xz")
125-
# print(package_name_2)
120+
if os.environ.get("PACKAGE", "") != "0":
121+
# s("cd {package_dir} && tar Jcfv ../../../{package_name}.tar.xz *")
122+
s("tar Jcfv ../../{package_name_2}.tar.xz FS-UAE")
123+
print(package_name_2)
124+
# s("cp ../../{package_name_2}.tar.xz ../../{package_name}.tar.xz")
125+
# print(package_name_2)
126126
print("OK")
127127

128128
#s("rm -Rf {dbg_package_dir}")

‎dist/linux/standalone-linux.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def fix_binary(path):
4545
# print(line)
4646
if not line.startswith("NEEDED"):
4747
continue
48-
print(line)
48+
print(os.path.basename(path), line)
4949
library = line.split(" ")[-1]
50-
print(library)
50+
# print(library)
5151
if ignore_library(library):
5252
continue
5353
library_source = library_locations[library]
@@ -63,7 +63,7 @@ def fix_binary(path):
6363
continue
6464
dst = os.path.join(os.path.dirname(path), library)
6565
if not os.path.exists(dst):
66-
print("copying", library)
66+
print("COPYLIB", library_source)
6767
shutil.copy(library_source, dst)
6868
os.chmod(dst, 0o644)
6969
changes += 1

‎dist/macos/standalone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def fix_binary(path, frameworks_dir):
3232
new = old.replace(old, "@executable_path/../Frameworks/" + name)
3333
dst = os.path.join(frameworks_dir, os.path.basename(old))
3434
if not os.path.exists(dst):
35-
print("copying", old)
35+
print("COPYLIB", old)
3636
shutil.copy(old, dst)
3737
os.chmod(dst, 0o644)
3838
changes += 1

‎dist/windows/clib.py

+19-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,26 @@
22

33
import os
44
import sys
5-
import subprocess
5+
# import subprocess
6+
import shutil
67

78
if os.getenv("MSYSTEM") == "MINGW32":
8-
mingw_dir = "/mingw32"
9+
prefix = "/mingw32"
910
elif os.getenv("MSYSTEM") == "MINGW64":
10-
mingw_dir = "/mingw64"
11+
prefix = "/mingw64"
1112

12-
p = subprocess.Popen([
13-
"sh", "-c",
14-
"cp {}/bin/{} {}".format(mingw_dir, sys.argv[1], sys.argv[2])])
15-
sys.exit(p.wait())
13+
dll = sys.argv[1]
14+
dst = sys.argv[2]
15+
16+
src = f"../../fsdeps/_dlls/{dll}"
17+
print(src)
18+
if os.path.exists(src):
19+
shutil.copy(src, dst)
20+
else:
21+
src = f"{prefix}/bin/{dll}"
22+
shutil.copy(src, dst)
23+
24+
# p = subprocess.Popen([
25+
# "sh", "-c",
26+
# "cp {}/bin/{} {}".format(prefix, sys.argv[1], sys.argv[2])])
27+
# sys.exit(p.wait())

‎docs/whdload.md

-81
This file was deleted.

‎fs-uae.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515

1616
%define name fs-uae
17-
%define version 3.9.100dev
18-
%define unmangled_version 3.9.100dev
17+
%define version 3.9.101dev
18+
%define unmangled_version 3.9.101dev
1919
%define release 1%{?dist}
2020

2121
%undefine _hardened_build

‎fsbuild/PACKAGE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FS-UAE

‎fsbuild/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.9.101dev

‎fsbuild/archive

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
set -e
3+
4+
. fsbuild/common.sh
5+
6+
cd fsbuild/_build
7+
8+
if [ "$OS" = "Windows" ]; then
9+
ARCHIVE=${PACKAGE}_${VERSION}_${OS}_${ARCH}.zip
10+
zip -r $ARCHIVE ${PACKAGE}
11+
else
12+
ARCHIVE=${PACKAGE}_${VERSION}_${OS}_${ARCH}.tar.xz
13+
tar cfJv $ARCHIVE ${PACKAGE}
14+
fi
15+
echo $ARCHIVE

‎fsbuild/bundle

+12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ rm -Rf _build
66
mkdir -p _build
77
cd ..
88

9+
if [ "`uname`" = "Linux" ]; then
10+
cd dist/linux
11+
BUILD=0 PACKAGE=0 make
12+
mv FS-UAE ../../fsbuild/_build
13+
cd ../..
14+
elif [ "`uname`" = "Darwin" ]; then
915
cd dist/macos
1016
SIGN=0 NOTARIZE=0 make plugin-no-archive
1117
mv FS-UAE ../../fsbuild/_build
1218
cd ../..
19+
elif [ "`uname -o`" = "Msys" ]; then
20+
cd dist/windows
21+
make progdir
22+
mv FS-UAE ../../fsbuild/_build
23+
cd ../..
24+
fi

‎fsbuild/common.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
PACKAGE=`cat fsbuild/PACKAGE`
2+
# VERSION=`python3 fsbuild/version.py`
3+
VERSION=`cat fsbuild/VERSION`
4+
if [ "`uname`" = "Linux" ]; then
5+
OS=Linux
6+
ARCH=x86_64
7+
elif [ "`uname`" = "Darwin" ]; then
8+
OS=macOS
9+
ARCH=x86_64
10+
elif [ "`uname -o`" = "Msys" ]; then
11+
OS=Windows
12+
ARCH=x86_64
13+
fi

‎fsbuild/make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
set -e
33

4-
make
4+
make "$@"

‎fsbuild/notarize

+20-15
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,20 @@ def main():
3535
arch = "x86-64" # FIXME
3636
app_path = f"fsbuild/_build/{app}/macOS/{arch}/{app}.app"
3737
shell("rm -f fsbuild/_build/Notarize.zip")
38-
shell("cd fsbuild/_build && zip -r Notarize.zip \"{}\"".format(app))
38+
shell('cd fsbuild/_build && zip -r Notarize.zip "{}"'.format(app))
3939
result = shell(
40-
"xcrun altool --notarize-app -t osx " \
41-
"-f fsbuild/_build/Notarize.zip " \
42-
"--primary-bundle-id {app_id} " \
43-
"-u {apple_id_user} " \
44-
"-p @env:NOTARIZATION_PASSWORD " \
45-
"-itc_provider {itc_provider} " \
46-
"--output-format xml".format(
47-
app_id=app_id, apple_id_user=apple_id_user,
48-
itc_provider=itc_provider))
40+
"xcrun altool --notarize-app -t osx "
41+
"-f fsbuild/_build/Notarize.zip "
42+
"--primary-bundle-id {app_id} "
43+
"-u {apple_id_user} "
44+
"-p @env:NOTARIZATION_PASSWORD "
45+
"-itc_provider {itc_provider} "
46+
"--output-format xml".format(
47+
app_id=app_id,
48+
apple_id_user=apple_id_user,
49+
itc_provider=itc_provider,
50+
)
51+
)
4952

5053
print(result)
5154
root = ET.fromstring(result)
@@ -57,10 +60,12 @@ def main():
5760
for i in range(60):
5861
time.sleep(10.0)
5962
result = shell(
60-
"xcrun altool --notarization-info {} " \
61-
"-u {} -p @env:NOTARIZATION_PASSWORD " \
63+
"xcrun altool --notarization-info {} "
64+
"-u {} -p @env:NOTARIZATION_PASSWORD "
6265
"-itc_provider {} --output-format xml".format(
63-
request_uuid, apple_id_user, itc_provider))
66+
request_uuid, apple_id_user, itc_provider
67+
)
68+
)
6469
if "<string>success</string>" in result:
6570
break
6671
elif "<string>in progress</string>" in result:
@@ -70,8 +75,8 @@ def main():
7075
print(result)
7176
raise Exception("...")
7277

73-
print("xcrun stapler staple \"{}\"".format(app_path))
74-
assert os.system("xcrun stapler staple \"{}\"".format(app_path)) == 0
78+
print('xcrun stapler staple "{}"'.format(app_path))
79+
assert os.system('xcrun stapler staple "{}"'.format(app_path)) == 0
7580

7681

7782
if __name__ == "__main__":

‎fsbuild/package

-4
This file was deleted.

‎fsbuild/rebuild

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
set -e
3+
4+
fsbuild/bootstrap
5+
fsbuild/configure
6+
fsbuild/make "$@"

0 commit comments

Comments
 (0)