diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/scripts/linux/4-package-viewer | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/scripts/linux/4-package-viewer')
| -rwxr-xr-x | linden/scripts/linux/4-package-viewer | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer index b2bff7f..a1a74f2 100755 --- a/linden/scripts/linux/4-package-viewer +++ b/linden/scripts/linux/4-package-viewer | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | cd ../../indra/viewer-linux-* | 3 | source config-SL-source |
| 4 | make package | ||
| 5 | 4 | ||
| 5 | if [ "$OSTYPE" == "cygwin" ] ; then | ||
| 6 | # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output. | ||
| 7 | cd ../../indra/build-nmake/ | ||
| 8 | iscc newview/${TYPE}/package/${version}-Windows-x86.iss | ||
| 9 | else | ||
| 10 | cd ../../indra/viewer-linux-* | ||
| 11 | make package | ||
| 12 | fi | ||