diff --git a/ubuntu18.04/base/Dockerfile b/ubuntu18.04/base/Dockerfile index e59df2c80845f48bf6c53d84d0185a0c44a9a5ac..74fb5af65951bdb3d3419689fb1ae6e60e3e1443 100644 --- a/ubuntu18.04/base/Dockerfile +++ b/ubuntu18.04/base/Dockerfile @@ -127,4 +127,3 @@ ADD agki-nas01.imp.fu-berlin.de-ca-cert.crt /usr/local/share/ca-certificates/agk RUN update-ca-certificates RUN apt-get clean -COPY profile.sh /etc/profile.d/robofish.sh diff --git a/ubuntu18.04/base/profile.sh b/ubuntu18.04/base/profile.sh deleted file mode 100644 index d10a25e634e1b84608e52f21fad4feb22fef269c..0000000000000000000000000000000000000000 --- a/ubuntu18.04/base/profile.sh +++ /dev/null @@ -1,24 +0,0 @@ -function gitlab-fetch-artifacts { - curl -o artifacts.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "https://git.imp.fu-berlin.de/api/v4/projects/$1/jobs/artifacts/$2/download?job=$3" - 7z e artifacts.zip; rm artifacts.zip -} - -function gitlab-trigger-pipeline { - curl --request POST --form "token=$2" --form "ref=$3" "https://git.imp.fu-berlin.de/api/v4/projects/$1/trigger/pipeline" -} - -function cmake-extract-package { - 7z e $1-*.tar.xz; rm $1-*.tar.xz - 7z x $1-*.tar; rm $1-*.tar - mkdir -p vendor - mv $1-* vendor/$1 -} - -function cmake-enable-package-discovery { - ln -s $(realpath vendor/$1) /usr/local/$1 -} - -function cmake-integrate-package { - cmake-extract-package $1 - cmake-enable-package-discovery $1 -} diff --git a/windows1809/base/Profile.ps1 b/windows1809/base/Profile.ps1 index 670db7e96348530fa03cb36019a0276fe22255d9..c8dfc1924d1dbfa8b856778f9d4fb5b892beaf6d 100644 --- a/windows1809/base/Profile.ps1 +++ b/windows1809/base/Profile.ps1 @@ -1,18 +1,4 @@ -# -# Sets up Visual Studio Development environment -# -function VSDevEnv { - pushd "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/Common7/Tools" - cmd /c "VsDevCmd.bat $args & set" | - foreach { - if ($_ -match "=") { - $v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" - } - } - popd -} - # # Sets exit to error when the command fails # @@ -26,39 +12,3 @@ function Must-Run { Exit(1) } } - -# -# Fetches GitLab CI job artifacts -# -function GitLab-Fetch-Artifacts { - & curl.exe -o artifacts.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "https://git.imp.fu-berlin.de/api/v4/projects/$($args[0])/jobs/artifacts/$($args[1])/download?job=$($args[2])" - 7z e artifacts.zip; Remove-Item -Force artifacts.zip -} - -# -# Unpacks a CMake package from its tarball into the vendor directory -# -function CMake-Extract-Package { - $name = $args[0] - 7z e $name-*.tar.xz; Remove-Item -Force $name-*.tar.xz - 7z x $name-*.tar; Remove-Item -Force $name-*.tar - New-Item -ItemType Directory -Force 'vendor' - Move-Item $name-* vendor/$name -} - -# -# Enable discovery of a CMake package in the vendor directory via find_package -# -function CMake-Enable-Package-Discovery { - $name = $args[0] - & cmd.exe /c mklink /J "C:/Program Files/$name" "$(resolve-path vendor/$name)" -} - -# -# Sets up a tarballed CMake package for find_package discovery -# -function CMake-Integrate-Package { - $name = $args[0] - CMake-Extract-Package $name - CMake-Enable-Package-Discovery $name -}