diff --git a/SourceGit.sln b/SourceGit.sln index 1efe00f1..80921840 100644 --- a/SourceGit.sln +++ b/SourceGit.sln @@ -13,11 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{773082AC EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{FD384607-ED99-47B7-AF31-FB245841BC92}" - ProjectSection(SolutionItems) = preProject - build\resources\App.icns = build\resources\App.icns - build\resources\App.plist = build\resources\App.plist - build\resources\SourceGit.desktop.template = build\resources\SourceGit.desktop.template - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F45A9D95-AF25-42D8-BBAC-8259C9EEE820}" EndProject @@ -36,6 +31,48 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{3AB707DB global.json = global.json LICENSE = LICENSE README.md = README.md + VERSION = VERSION + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{ABC98884-F023-4EF4-A9C9-5DE9452BE955}" + ProjectSection(SolutionItems) = preProject + build\resources\app\App.icns = build\resources\app\App.icns + build\resources\app\App.plist = build\resources\app\App.plist + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{04FD74B1-FBDB-496E-A48F-3D59D71FF952}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "usr", "usr", "{76639799-54BC-45E8-BD90-F45F63ACD11D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bin", "bin", "{2E27E952-846B-4D75-A426-D22151277864}" + ProjectSection(SolutionItems) = preProject + build\resources\_common\usr\bin\sourcegit = build\resources\_common\usr\bin\sourcegit + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "share", "share", "{A3ABAA7C-EE14-4448-B466-6E69C1347E7D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{2AF28D3B-14A8-46A8-B828-157FAAB1B06F}" + ProjectSection(SolutionItems) = preProject + build\resources\_common\usr\share\applications\sourcegit.desktop = build\resources\_common\usr\share\applications\sourcegit.desktop + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "icons", "icons", "{7166EC6C-17F5-4B5E-B38E-1E53C81EACF6}" + ProjectSection(SolutionItems) = preProject + build\resources\_common\usr\share\icons\sourcegit.png = build\resources\_common\usr\share\icons\sourcegit.png + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deb", "deb", "{9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DEBIAN", "DEBIAN", "{F101849D-BDB7-40D4-A516-751150C3CCFC}" + ProjectSection(SolutionItems) = preProject + build\resources\deb\DEBIAN\control = build\resources\deb\DEBIAN\control + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpm", "rpm", "{9BA0B044-0CC9-46F8-B551-204F149BF45D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPECS", "SPECS", "{7802CD7A-591B-4EDD-96F8-9BF3F61692E4}" + ProjectSection(SolutionItems) = preProject + build\resources\rpm\SPECS\build.spec = build\resources\rpm\SPECS\build.spec EndProjectSection EndProject Global @@ -56,6 +93,17 @@ Global {2091C34D-4A17-4375-BEF3-4D60BE8113E4} = {49A7C2D6-558C-4FAA-8F5D-EEE81497AED7} {FD384607-ED99-47B7-AF31-FB245841BC92} = {773082AC-D9C8-4186-8521-4B6A7BEE6158} {67B6D05F-A000-40BA-ADB4-C9065F880D7B} = {F45A9D95-AF25-42D8-BBAC-8259C9EEE820} + {ABC98884-F023-4EF4-A9C9-5DE9452BE955} = {FD384607-ED99-47B7-AF31-FB245841BC92} + {04FD74B1-FBDB-496E-A48F-3D59D71FF952} = {FD384607-ED99-47B7-AF31-FB245841BC92} + {76639799-54BC-45E8-BD90-F45F63ACD11D} = {04FD74B1-FBDB-496E-A48F-3D59D71FF952} + {2E27E952-846B-4D75-A426-D22151277864} = {76639799-54BC-45E8-BD90-F45F63ACD11D} + {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} = {76639799-54BC-45E8-BD90-F45F63ACD11D} + {2AF28D3B-14A8-46A8-B828-157FAAB1B06F} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} + {7166EC6C-17F5-4B5E-B38E-1E53C81EACF6} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} + {9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC} = {FD384607-ED99-47B7-AF31-FB245841BC92} + {F101849D-BDB7-40D4-A516-751150C3CCFC} = {9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC} + {9BA0B044-0CC9-46F8-B551-204F149BF45D} = {FD384607-ED99-47B7-AF31-FB245841BC92} + {7802CD7A-591B-4EDD-96F8-9BF3F61692E4} = {9BA0B044-0CC9-46F8-B551-204F149BF45D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7FF1B9C6-B5BF-4A50-949F-4B407A0E31C9} diff --git a/build/VERSION b/VERSION similarity index 100% rename from build/VERSION rename to VERSION diff --git a/build/build.linux.sh b/build/build.linux.sh index b5dd854b..080341bf 100644 --- a/build/build.linux.sh +++ b/build/build.linux.sh @@ -1,6 +1,6 @@ #!/bin/sh -version=`cat ./VERSION` +version=`cat ../VERSION` # Cleanup rm -rf SourceGit *.tar.gz resources/deb/opt *.deb *.rpm @@ -28,4 +28,4 @@ dpkg-deb --build resources/deb ./sourcegit_${version}-1_amd64.deb rpmbuild -bb --target=x86_64 resources/rpm/SPECS/build.spec --define "_topdir `pwd`/resources/rpm" --define "_version ${version}" mv resources/rpm/RPMS/x86_64/sourcegit-${version}-1.x86_64.rpm . -rm -rf SourceGit \ No newline at end of file +rm -rf SourceGit diff --git a/build/build.osx.command b/build/build.osx.command index df3222b0..985dbebc 100644 --- a/build/build.osx.command +++ b/build/build.osx.command @@ -1,6 +1,6 @@ #!/bin/sh -version=`cat ./VERSION` +version=`cat ../VERSION` rm -rf SourceGit.app *.zip @@ -18,4 +18,4 @@ mkdir -p SourceGit.app/Contents/MacOS dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained zip sourcegit_${version}.osx-x64.zip -r SourceGit.app -x "*/*\.dsym/*" -rm -rf SourceGit.app \ No newline at end of file +rm -rf SourceGit.app diff --git a/build/build.windows.ps1 b/build/build.windows.ps1 index ddca1e1e..392a1ec3 100644 --- a/build/build.windows.ps1 +++ b/build/build.windows.ps1 @@ -1,4 +1,4 @@ -$version = Get-Content .\VERSION +$version = Get-Content ..\VERSION if (Test-Path SourceGit) { Remove-Item SourceGit -Recurse -Force diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj index ecad8b6c..4a078c8b 100644 --- a/src/SourceGit.csproj +++ b/src/SourceGit.csproj @@ -5,7 +5,7 @@ true App.manifest App.ico - 8.8 + $([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION")) false true true