Merge pull request #1994 from uenz/fix/BuildMacOS

Fixed link errors and pack release
This commit is contained in:
Hylke Bons 2023-01-24 14:59:39 +01:00 committed by GitHub
commit 01c180d588
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View file

@ -100,7 +100,7 @@
<Profiling>false</Profiling> <Profiling>false</Profiling>
<HttpClientHandler>HttpClientHandler</HttpClientHandler> <HttpClientHandler>HttpClientHandler</HttpClientHandler>
<TlsProvider>Default</TlsProvider> <TlsProvider>Default</TlsProvider>
<LinkMode>None</LinkMode> <LinkMode>Platform</LinkMode>
<AOTMode>None</AOTMode> <AOTMode>None</AOTMode>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
@ -128,7 +128,7 @@
<Profiling>false</Profiling> <Profiling>false</Profiling>
<HttpClientHandler>HttpClientHandler</HttpClientHandler> <HttpClientHandler>HttpClientHandler</HttpClientHandler>
<TlsProvider>Default</TlsProvider> <TlsProvider>Default</TlsProvider>
<LinkMode>None</LinkMode> <LinkMode>Platform</LinkMode>
<CodeSigningKey>Mac Developer</CodeSigningKey> <CodeSigningKey>Mac Developer</CodeSigningKey>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey> <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
<AOTMode>None</AOTMode> <AOTMode>None</AOTMode>
@ -157,7 +157,7 @@
<UseSGen>false</UseSGen> <UseSGen>false</UseSGen>
<UseRefCounting>false</UseRefCounting> <UseRefCounting>false</UseRefCounting>
<Profiling>false</Profiling> <Profiling>false</Profiling>
<LinkMode>None</LinkMode> <LinkMode>Platform</LinkMode>
<HttpClientHandler>HttpClientHandler</HttpClientHandler> <HttpClientHandler>HttpClientHandler</HttpClientHandler>
<TlsProvider>Default</TlsProvider> <TlsProvider>Default</TlsProvider>
<AOTMode>None</AOTMode> <AOTMode>None</AOTMode>

View file

@ -10,15 +10,19 @@ export MONO_PATH=`readlink /Library/Frameworks/Mono.framework/Versions/Current`
export PKG_CONFIG_PATH=/usr/lib/pkgconfig:${MONO_PATH}/lib/pkgconfig export PKG_CONFIG_PATH=/usr/lib/pkgconfig:${MONO_PATH}/lib/pkgconfig
export PATH=/usr/local/bin:/opt/local/bin:/Library/Frameworks/Mono.framework/Versions/Current/bin:/usr/bin:/bin export PATH=/usr/local/bin:/opt/local/bin:/Library/Frameworks/Mono.framework/Versions/Current/bin:/usr/bin:/bin
mkdir -p cd ${bundle}/Contents/MonoBundle/
cd ${bundle}/Contents/MonoBundle/ cd ${bundle}/Contents/MonoBundle/
assemblyPath=$(dirname $(dirname $(dirname $(pwd))))
echo ${projectFolder}
pwd
echo "x"
echo ${assemblyPath}
# merge all Assemblies into one Mac binary # merge all Assemblies into one Mac binary
mkbundle \ mkbundle \
--simple \ --simple \
-v \ -v \
--config ./config \ --config ./config \
--library libxammac.dylib \
--library libmono-native-compat.0.dylib \
-o ../MacOS/SparkleShare \ -o ../MacOS/SparkleShare \
SparkleShare.exe Sparkles.dll Sparkles.Git.dll ${assemblyPath}/SparkleShare.exe ${assemblyPath}/Sparkles.dll ${assemblyPath}/Sparkles.Git.dll
rm *.dll *.exe rm *.dll *.exe