Fixes to run the scripts from the contrib directory.

Also expanded the README.
smmmo · Feb 8, 2012 · f258d58 · f258d58
1 parent 6e0f557
commit f258d58
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 80 deletions.
diff --git a/contrib/README.md b/contrib/README.md
@@ -1,21 +1,57 @@
-# BUILD PMS BINARIES
+# Build PMS binaries
+
+These scripts are only meant for enthusiasts that want to bundle their PMS with
+custom built versions of libraries and tools, replacing the standard versions
+shipped with the regular PMS distribution.
+
+There are two scripts available: the first for downloading the sources and the
+second for building the sources into binaries.
+
+After running both scripts the following directory structure is created:
+
+    ps3mediaserver/
+      |
+      +-- contrib/
+      |     |
+      |     +-- binaries-deps-versions
+      |     +-- build-pms-binaries.sh
+      |     +-- download-pms-binaries-source.sh 
+      |
+      +-- target/
+            |
+            +-- bin-tools/
+                  |
+                  +-- build/
+                  +-- src/
+                  +-- target/
+                        |
+                        +-- bin/
+                        +-- lib/
+
+Search `../target/bin-tools/target/bin/` for compiled binaries and
+`../target/bin-tools/target/lib/` for libraries.
 
-These scripts are only meant for enthusiasts that want to bundle their PMS with custom built versions of libraries and tools, replacing the standard versions shipped with the regular PMS distribution.
 
 ## Downloading (and updating) sources
+This script downloads the sources for the binaries and libraries:
 
-    contrib/download-pms-binaries-source.sh
+    download-pms-binaries-source.sh
 
-Sources archives will be strored in _target/bin-tools/src/_
+Run the script and the source archives and directories will be stored in
+`../target/bin-tools/src/`.
 
-## Building bainaries
 
-    contrib/build-pms-binaries.sh
+## Building binaries
+This script builds binaries from the sources that were downloaded with the
+other script:
+
+    build-pms-binaries.sh
 
-Search _target/bin-tools/target/bin/_ for compiled binaries and _target/bin-tools/target/lib/_ for libs
 
 ## Cleaning up
+To clean up built binaries, remove the following directories:
+
+    rm -rf ../target/bin-tools/build/
+    rm -rf ../target/bin-tools/target/
 
-    rm -rf target/bin-tools/build/
-    rm -rf target/bin-tools/target/
 
diff --git a/contrib/build-pms-binaries.sh b/contrib/build-pms-binaries.sh
@@ -112,7 +112,7 @@ THREADS="2"
 
 
 # binaries deps versions
-. contrib/binaries-deps-versions
+. binaries-deps-versions
 
 
 ##########################################
@@ -384,8 +384,8 @@ initialize() {
     WORKDIR=`pwd`
 
     # Directories for statically compiled libraries
-    TARGET="$WORKDIR/target/bin-tools/target"
-    SRC="$WORKDIR/target/bin-tools/build"
+    TARGET="$WORKDIR/../target/bin-tools/target"
+    SRC="$WORKDIR/../target/bin-tools/build"
     createdir "$SRC"
     createdir "$TARGET"