move to opt, add resources

3 files changed, 28 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cd5af2e4229..8877a5b57f9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = servo-git
 	pkgdesc = Parallel Browser Project: web browser written in Rust
-	pkgver = 11957.a2978f2
+	pkgver = 12112.842112c
 	pkgrel = 1
 	url = https://github.com/servo/servo
+	install = servo-git.install
 	arch = i686
 	arch = x86_64
 	license = MPL
diff --git a/PKGBUILD b/PKGBUILD
index 8b788ea4dfb6..e440deab8c25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,9 @@
+# Maintainer: Vlad M. <vlad@archlinux.net>
+# COntributor: beatgammit
+
 pkgname=servo-git
-pkgver=11959.4d7dd66
+_pkgname=servo
+pkgver=12112.842112c
 pkgrel=1
 pkgdesc="Parallel Browser Project: web browser written in Rust"
 arch=('i686' 'x86_64')
@@ -7,40 +11,49 @@ url="https://github.com/servo/servo"
 license=('MPL')
 depends=('freetype2' 'mesa' 'libxrandr' 'libxi' 'libgl' 'glu' 'fontconfig'
          'ttf-font' 'bzip2' 'libxcursor' 'libxmu')
+install="$pkgname.install"
 makedepends=('git' 'curl' 'python2' 'python2-virtualenv' 'gperf'
              'cmake')
-provides=('servo')
-conflicts=('servo' 'rust')
+provides=("$_pkgname")
+conflicts=("$_pkgname" 'rust')
 source=('git+https://github.com/servo/servo.git')
 md5sums=('SKIP')
 
 pkgver() {
-  cd $srcdir/servo
+  cd "$_pkgname"
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 build() {
-  cd $srcdir/servo
-
+  cd "$_pkgname"
+  
   # fixes build error
   # possibly _FORTIFY_SOURCE? https://bugs.archlinux.org/task/34759
   unset CPPFLAGS
 
-  ./mach build -d
+  ./mach build --dev
 }
 
 package() {
   servopath=servo/target/debug
-  install -Dm755 "$srcdir/$servopath/servo" "$pkgdir/usr/bin/servo"
+  install -Dm755 "$servopath/servo" "$pkgdir/opt/servo/servo"
 
   mkdir -p "$pkgdir/usr/lib"
 
-  find $srcdir/$servopath/deps -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
-	  _file=$(find $srcdir/$servopath/deps -name "$_f" -print | head -n 1)
+  find "$servopath/deps" -name "*-*.so" -exec basename {} \; | sort | uniq | while read _f; do
+	  _file=$(find "$servopath/deps" -name "$_f" -print | head -n 1)
 	  if [ -z "$_file" ]; then
 		  echo "Skipping: $_f"
 		  continue
 	  fi
 	  install -Dm644 "$_file" "$pkgdir/usr/lib"
   done
+
+  mkdir -p "$pkgdir/opt/servo/resources"
+  cp -r servo/resources/* "$pkgdir/opt/servo/resources"
+
+  mkdir -p "$pkgdir/etc/profile.d" 
+  echo 'export PATH=$PATH:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.sh"
+  echo 'setenv PATH ${PATH}:/opt/servo' > "$pkgdir/etc/profile.d/${_pkgname}.csh"
+  chmod 755 "$pkgdir/etc/profile.d/${_pkgname}".{csh,sh}
 }
diff --git a/servo-git.install b/servo-git.install
new file mode 100644
index 000000000000..654977177cfb
--- /dev/null
+++ b/servo-git.install
@@ -0,0 +1,3 @@
+post_install() {
+    echo You need to source /etc/profile or relogin to add Servo to your path.
+}