Updates package.json with dependencies and scripts. Removes Makefile. Adds version to the library.

.gitignore

@@ -5,3 +5,4 @@ node_modules
 .*.tmp
 deploy-local.sh
 .remote-sync.json
+lib-jitsi-meet.*

JitsiMeetJS.js

@@ -32,6 +32,8 @@ function getLowerResolution(resolution) {
  */
 var LibJitsiMeet = {
 
+    version: '{#COMMIT_HASH#}',
+
     JitsiConnection: JitsiConnection,
     events: {
         conference: JitsiConferenceEvents,

Makefile

@@ -1,41 +0,0 @@
-NPM = npm
-BROWSERIFY = ./node_modules/.bin/browserify
-UGLIFYJS = ./node_modules/.bin/uglifyjs
-EXORCIST = ./node_modules/.bin/exorcist
-GLOBAL_FLAGS =
-OUTPUT_DIR = .
-DEPLOY_DIR = ../../jitsi-meet
-
-all: update-deps compile uglify deploy
-
-compile:FLAGS = $(GLOBAL_FLAGS)
-compile: app
-
-debug: compile-debug source-maps uglify-debug deploy
-
-compile-debug:FLAGS = -d $(GLOBAL_FLAGS)
-compile-debug: app
-
-update-deps:
-	$(NPM) update
-
-app:
-	$(BROWSERIFY) $(FLAGS) JitsiMeetJS.js -s JitsiMeetJS -o $(OUTPUT_DIR)/lib-jitsi-meet.js
-
-source-maps:
-	cat $(OUTPUT_DIR)/lib-jitsi-meet.js | $(EXORCIST) $(OUTPUT_DIR)/lib-jitsi-meet.js.map
-
-uglify:SOURCE_MAPS=
-uglify:
-	$(UGLIFYJS) -p relative $(OUTPUT_DIR)/lib-jitsi-meet.js -o $(OUTPUT_DIR)/lib-jitsi-meet.min.js $(SOURCE_MAPS)
-
-uglify-debug:SOURCE_MAPS=--source-map $(OUTPUT_DIR)/lib-jitsi-meet.min.map --in-source-map $(OUTPUT_DIR)/lib-jitsi-meet.js.map
-uglify-debug: uglify
-
-clean:
-	rm -f $(OUTPUT_DIR)/lib-jitsi-meet.js
-
-deploy:
-	mkdir -p $(DEPLOY_DIR) && \
-	cp $(OUTPUT_DIR)/lib-jitsi-meet.js $(DEPLOY_DIR) && \
-	([ ! -x deploy-local.sh ] || ./deploy-local.sh)

get-version.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+if [[ -z "$LIB_JITSI_MEET_REPO" ]];
+then
+    LIB_JITSI_MEET_REPO="."
+fi
+
+COMMIT_HASH=$(cd $LIB_JITSI_MEET_REPO && git rev-parse --short HEAD)
+COMMIT_TAG=$(cd $LIB_JITSI_MEET_REPO && git describe --abbrev=0 --tags)
+
+echo "${COMMIT_TAG}#${COMMIT_HASH}";

package.json

@@ -24,7 +24,10 @@
     "retry": "0.6.1",
     "jssha": "1.5.0",
     "es6-promise": "*",
-    "jitsi-meet-logger": "jitsi/jitsi-meet-logger"
+    "jitsi-meet-logger": "jitsi/jitsi-meet-logger",
+    "strophe": "^1.2.2",
+    "strophejs-plugins": "^0.0.6",
+    "socket.io-client": "1.3.6"
   },
   "devDependencies": {
     "browserify": "11.1.x",
@@ -34,7 +37,16 @@
     "uglify-js": "2.4.24"
   },
   "scripts": {
-    "lint": "./node_modules/.bin/jshint .",
+    "install": "npm run browserify && npm run version && npm run uglifyjs",
+    "postinstall": "npm run deploy",
+
+    "browserify": "browserify -d JitsiMeetJS.js -s JitsiMeetJS | exorcist lib-jitsi-meet.js.map > lib-jitsi-meet.js ",
+    "version": "VERSION=`./get-version.sh` && sed -i '' s/{#COMMIT_HASH#}/${VERSION}/g lib-jitsi-meet.js",
+    "uglifyjs": "uglifyjs -p relative lib-jitsi-meet.js -o lib-jitsi-meet.min.js --source-map lib-jitsi-meet.min.map --in-source-map lib-jitsi-meet.js.map",
+
+    "deploy": "DEPLOY_DIR='../../libs' && [ -d $DEPLOY_DIR ] && cp lib-jitsi-meet.* $DEPLOY_DIR",
+
+    "lint": "jshint .",
     "validate": "npm ls"
   },
   "pre-commit": [