projects / packages / mozjs38.git / blame
| Commit | Line | Data |
|---|---|---|
| 9b7b3ede MB |
1 | # HG changeset patch |
| 2 | # Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a | |
| 3 | Add major version to shell and js-config filenames. | |
| 4 | Author: Rico Tzschichholz <ricotz@ubuntu.com> | |
| 5 | Forwarded: no | |
| 6 | Last-Update: 2014-10-29 | |
| 7 | ||
| 8 | --- | |
| 9 | diff --git a/js/src/configure b/js/src/configure | |
| 10 | --- a/js/src/configure | |
| 11 | +++ b/js/src/configure | |
| 12 | @@ -1696,8 +1696,13 @@ | |
| 13 | MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` | |
| 14 | IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` | |
| 15 | ||
| 16 | +if test -n "$JS_STANDALONE"; then | |
| 17 | +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION | |
| 18 | +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config | |
| 19 | +else | |
| 20 | JS_SHELL_NAME=js | |
| 21 | JS_CONFIG_NAME=js-config | |
| 22 | +fi | |
| 23 | ||
| 24 | ||
| 25 | if test -n "$IS_ALPHA"; then | |
| 26 | ||
| 27 | diff --git a/js/src/configure.in b/js/src/configure.in | |
| 28 | --- a/js/src/configure.in | |
| 29 | +++ b/js/src/configure.in | |
| 30 | @@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI | |
| 31 | MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` | |
| 32 | IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` | |
| 33 | ||
| 34 | -dnl XXX in a temporary bid to avoid developer anger at renaming files | |
| 35 | -dnl XXX before "js" symlinks exist, don't change names. | |
| 36 | -dnl | |
| 37 | -dnl if test -n "$JS_STANDALONE"; then | |
| 38 | -dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION | |
| 39 | -dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config | |
| 40 | -dnl else | |
| 41 | +if test -n "$JS_STANDALONE"; then | |
| 42 | +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION | |
| 43 | +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config | |
| 44 | +else | |
| 45 | JS_SHELL_NAME=js | |
| 46 | JS_CONFIG_NAME=js-config | |
| 47 | -dnl fi | |
| 48 | +fi | |
| 49 | ||
| 50 | changequote([,]) | |
| 51 | if test -n "$IS_ALPHA"; then | |
| 52 | ||
| 53 | diff -r 80a9e64d75f5 js/src/Makefile.in | |
| 54 | --- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 | |
| 55 | +++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 | |
| 56 | @@ -273,6 +273,9 @@ | |
| 57 | SCRIPTS = $(JS_CONFIG_NAME) | |
| 58 | SDK_BINARY = $(JS_CONFIG_NAME) | |
| 59 | ||
| 60 | +$(JS_CONFIG_NAME): js-config | |
| 61 | + cp $^ $@ | |
| 62 | + | |
| 63 | $(LIBRARY_NAME).pc: js.pc | |
| 64 | cp $^ $@ | |
| 65 |