Skip to content
Snippets Groups Projects
Commit e286ee2a authored by Jonathan Ehret's avatar Jonathan Ehret
Browse files

Merge branch 'feature/add-plugin-selection' into 'develop'

Feature/add plugin selection

See merge request VR-Group/unreal-development/unrealprojecttemplate!31
parents 82b00b3f 33c25c67
No related branches found
No related tags found
No related merge requests found
[submodule "Plugins/nDisplayExtensions"] [submodule "setup"]
path = Plugins/nDisplayExtensions path = setup
url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-project-setup-script.git
[submodule "Plugins/CaveOverlay"] branch = master
path = Plugins/CaveOverlay
url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-cave-overlay.git
CaveOverlay @ 6418ac3a
Subproject commit 6418ac3acb3b522f6f06fb1b79928f357afdec81
nDisplayExtensions @ 13607574
Subproject commit 13607574073f0bb3cdea6154a2a1924e7e51b543
...@@ -17,10 +17,6 @@ ...@@ -17,10 +17,6 @@
{ {
"Name": "nDisplay", "Name": "nDisplay",
"Enabled": true "Enabled": true
},
{
"Name": "nDisplayExtensions",
"Enabled": true
} }
], ],
"TargetPlatforms": [ "TargetPlatforms": [
......
...@@ -8,7 +8,7 @@ public class RwthVrTemplate : ModuleRules ...@@ -8,7 +8,7 @@ public class RwthVrTemplate : ModuleRules
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "DisplayClusterExtensions", "DisplayCluster", "Engine", "InputCore" }); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "DisplayCluster", "Engine", "InputCore" });
PrivateDependencyModuleNames.AddRange(new string[] { }); PrivateDependencyModuleNames.AddRange(new string[] { });
......
setup @ 7a755e44
Subproject commit 7a755e44b93e97ad7ade3c78512e5196f9f53f06
setup.sh 100644 → 100755
#!/bin/sh #!/bin/sh
if [ ! -f "update.txt" ] git submodule update --init -- setup
then /bin/sh setup/setup.sh
remote_branch=$(git rev-parse --abbrev-ref @{u}) \ No newline at end of file
if [[ "$remote_branch" != "origin/"* ]]
then
echo "This script can only handle remotes named origin!"
exit -1
fi
remote_branch=${remote_branch#"origin/"}
repository_url=$(git remote get-url origin)
echo "$repository_url"
echo "$repository_url" >> update.txt
echo "$remote_branch" >> update.txt
fi
current_branch=$(git rev-parse --abbrev-ref HEAD)
branches_to_delete=$(git for-each-ref --format='%(refname:short)' refs/heads/)
for branch in $branches_to_delete
do
if [ "$branch" != "$current_branch" ]
then
git branch -d "$branch"
fi
done
if [ "$current_branch" != "develop" ]
then
git checkout -b develop
git branch -d "$current_branch"
fi
git remote remove origin
git add .
git commit -m "Initial commit"
git branch master
echo "Enter URL of the project's git repository (Leave empty to skip this step):"
read new_remote
if [ -n "$new_remote" ]
then
echo "Setting up repository..."
git remote add origin $new_remote
git push -u origin develop
git checkout master
git push -u origin master
git checkout develop
fi
echo "Done!"
\ No newline at end of file
#!/bin/sh
if [ ! -f "update.txt" ]
then
echo "The file update.txt does not exists."
echo "Make sure setup.sh has been run and the file is checked in into git."
exit -1
fi
readarray -n 2 -t update < update.txt
remote=${update[0]}
branch=${update[1]}
template_remote=$(git remote | grep template-origin)
if [ -z "$template_remote" ]
then
echo "Add remote for the template."
git remote add template-origin "${update[0]}"
else
old_remote=$(git remote get-url template-origin)
if [ $old_remote != $remote ]
then
echo "The remote for the template changed, updating it."
git remote remove template-origin
git remote add template-origin "${update[0]}"
fi
fi
# Check if remote exists
if ! git ls-remote "$remote" &> /dev/null
then
echo "The remote '$remote' is not a valid git repository."
echo "Please update the first line in 'update.txt'."
exit -1
fi
# Check if remote branch exists
if ! git ls-remote --exit-code --heads "$remote" "$branch" &> /dev/null
then
echo "The branch '$branch' does not exist on the remote repository."
echo "Please update the second line in 'update.txt'."
exit -2
fi
git fetch template-origin $branch
git merge template-origin/$branch
echo "Done!"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment