Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 201e18e

Browse files
StanleyGoldmanStanleyGoldman
authored
Merge pull request #266 from github-for-unity/fixes/location-location-location
Move extension installation location to Assets/Plugins/GitHub
2 parents c9711a9 + 30e4af5 commit 201e18e

37 files changed

+69
-56
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Notices
44

5-
From version 0.19 onwards, the location of the plugin has moved to `Assets/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
5+
From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
66

77
![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
88

‎build.cmd‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ if not %2.==. (
1212
)
1313

1414
if %Target%==Rebuild (
15-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.dll
16-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.mdb
17-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
18-
19-
if exist "..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor" (
20-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.dll
21-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.mdb
22-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.pdb
15+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.dll
16+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.mdb
17+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb
18+
19+
if exist "..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor" (
20+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.dll
21+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.mdb
22+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.pdb
2323
)
2424
)
2525

@@ -28,18 +28,18 @@ call common\nuget.exe restore GitHub.Unity.sln
2828
echo xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
2929
call xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=%Configuration% /target:%Target%
3030

31-
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
32-
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
33-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
31+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
32+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
33+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.xml
3434

35-
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
36-
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\
35+
echo xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Plugins\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
36+
call xcopy /C /H /R /S /Y /Q unity\PackageProject\Assets\Plugins\GitHub ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
3737

38-
echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
39-
call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\
38+
echo xcopy /C /H /R /Y /Q unity\PackageProject\Assets\Plugins\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
39+
call xcopy /C /H /R /Y /Q unity\PackageProject\Assets\Plugins\GitHub.meta ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\
4040

41-
if exist ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor (
42-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
43-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\deleteme*
44-
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor\*.xml
41+
if exist ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor (
42+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\deleteme*
43+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\deleteme*
44+
del /Q ..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor\*.xml
4545
)

‎build.sh‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ if [ $# -gt 1 ]; then
1010
fi
1111

1212
if [ x"$Target" == x"Rebuild" ]; then
13-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.dll
14-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.mdb
15-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
16-
17-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
18-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.dll
19-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.mdb
20-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.pdb
13+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.dll
14+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.mdb
15+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb
16+
17+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor ]; then
18+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.dll
19+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.mdb
20+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.pdb
2121
fi
2222
fi
2323

@@ -34,16 +34,16 @@ fi
3434

3535
xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true
3636

37-
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
38-
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
39-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
37+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
38+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
39+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
4040

41-
cp -r unity/PackageProject/Assets/GitHub ../github-unity-test/GitHubExtensionProject/Assets/ || true
42-
cp -r unity/PackageProject/Assets/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/ || true
41+
cp -r unity/PackageProject/Assets/Plugins/GitHub ../github-unity-test/GitHubExtensionProject/Assets/Plugins/ || true
42+
cp -r unity/PackageProject/Assets/Plugins/GitHub.meta ../github-unity-test/GitHubExtensionProject/Assets/Plugins/ || true
4343

4444

45-
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor ]; then
46-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
47-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/deleteme*
48-
rm -f ../github-unity-test/GitHubExtensionProject/Assets/GitHub/Editor/*.xml
45+
if [ -e ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor ]; then
46+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/deleteme*
47+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/deleteme*
48+
rm -f ../github-unity-test/GitHubExtensionProject/Assets/Plugins/GitHub/Editor/*.xml
4949
fi

‎common/SolutionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.19.0.0";
34+
internal const string Version = "0.19.0";
3535
}
3636
}

‎common/packaging.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<PropertyGroup>
5-
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\GitHub\Editor</PublishTo>
6-
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\GitHub\Editor</ExternalPublishTo>
5+
<PublishTo Condition="'$(PublishTo)' == '' ">$(SolutionDir)\unity\PackageProject\Assets\Plugins\GitHub\Editor</PublishTo>
6+
<ExternalPublishTo>$(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Plugins\GitHub\Editor</ExternalPublishTo>
77
</PropertyGroup>
88

99
<!-- After the build is done, we copy all the artifacts into two locations:

‎package.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ if not exist "%Unity%" (
4242
echo xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4343
call xbuild GitHub.Unity.sln /property:Configuration=%Configuration%
4444

45-
del /Q unity\PackageProject\Assets\GitHub\Editor\deleteme*
46-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb
47-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.pdb.meta
48-
del /Q unity\PackageProject\Assets\GitHub\Editor\*.xml
45+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\deleteme*
46+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb
47+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.pdb.meta
48+
del /Q unity\PackageProject\Assets\Plugins\GitHub\Editor\*.xml
4949

5050
for /f tokens^=^2^ usebackq^ delims^=^" %%G in (`find "const string Version" common\SolutionInfo.cs`) do call :Package %%G
5151

‎package.sh‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ fi
5353

5454
xbuild GitHub.Unity.sln /property:Configuration=$Configuration
5555

56-
rm -f unity/PackageProject/Assets/GitHub/Editor/deleteme*
57-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb
58-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.pdb.meta
59-
rm -f unity/PackageProject/Assets/GitHub/Editor/*.xml
56+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
57+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb
58+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.pdb.meta
59+
rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/*.xml
6060

6161
Version=`sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs`
62+
commitcount=`git rev-list --count HEAD`
63+
commit=`git log -n1 --pretty=format:%h`
64+
Version="${Version}.${commitcount}-${commit}"
65+
Version=$Version
6266
export GITHUB_UNITY_DISABLE=1
63-
"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/GitHub/Editor github-for-unity-$Version-alpha.unitypackage -force-free -quit
67+
"$Unity" -batchmode -projectPath "`pwd`/unity/PackageProject" -exportPackage Assets/Plugins/GitHub/Editor github-for-unity-$Version.unitypackage -force-free -quit

‎src/GitHub.Api/Resources/.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/[Bb]uilds/
66

77
/Assets/AssetStoreTools*
8-
/Assets/GitHub.meta
9-
/Assets/GitHub/
8+
/Assets/Plugins/GitHub.meta
9+
/Assets/Plugins/GitHub/
1010

1111
# Visual Studio 2015 cache directory
1212
/.vs/

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitHub.Unity</AssemblyName>
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<OutputPath>$(SolutionDir)\unity\TestProject\Assets\GitHub\Editor\</OutputPath>
14+
<OutputPath>$(SolutionDir)\unity\TestProject\Assets\Plugins\GitHub\Editor\</OutputPath>
1515
<IntermediateOutputPath>..\..\..\obj\</IntermediateOutputPath>
1616
</PropertyGroup>
1717
<Import Project="..\..\..\..\..\common\properties.props" />

‎unity/PackageProject/.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ProjectVersion.txt
1313
Library/
1414

1515
// These files come from lib/
16-
Assets/GitHub/Editor/libsfw.bundle.meta
17-
Assets/GitHub/Editor/libsfw.so.meta
18-
Assets/GitHub/Editor/x64/
19-
Assets/GitHub/Editor/x86/
16+
Assets/Plugins/GitHub/Editor/libsfw.bundle.meta
17+
Assets/Plugins/GitHub/Editor/libsfw.so.meta
18+
Assets/Plugins/GitHub/Editor/x64/
19+
Assets/Plugins/GitHub/Editor/x86/

0 commit comments

Comments
 (0)