soyjavi 14 лет назад
Родитель
Сommit
74629f2cb6
3 измененных файлов с 10 добавлено и 14 удалено
  1. 3 3
      LICENSE.txt
  2. 2 2
      src/Lungo.js
  3. 5 9
      vendor/build.sh

+ 3 - 3
LICENSE.txt

@@ -4,7 +4,7 @@ Copyright (c) 2011-2012 TapQuo Inc (Javier Jimenez Villar)
 ===============================================================================
 ===============================================================================
 
 
 OPEN SOURCE LICENSE FOR LUNGOJS
 OPEN SOURCE LICENSE FOR LUNGOJS
-Version 1.2
+Version 2.0
 
 
 LungoJS is an avid supporter of open source software. This is the appropriate
 LungoJS is an avid supporter of open source software. This is the appropriate
 option if you are creating an open source application with a license compatible
 option if you are creating an open source application with a license compatible
@@ -31,7 +31,7 @@ THE SOFTWARE IS LICENSED, NOT SOLD.
 ===============================================================================
 ===============================================================================
 
 
 OPEN SOURCE LICENSE FAQ
 OPEN SOURCE LICENSE FAQ
-Version 1.2
+Version 2.0
 
 
 This document is for guidance purposes only and is not a legal document and is
 This document is for guidance purposes only and is not a legal document and is
 not legally binding. We encourage you to read the GPL v3 and the Quick Guide to
 not legally binding. We encourage you to read the GPL v3 and the Quick Guide to
@@ -42,7 +42,7 @@ advice.
 ===============================================================================
 ===============================================================================
 
 
 LUNGOJS AND THE GPL v3
 LUNGOJS AND THE GPL v3
-Version 1.2
+Version 2.0
 
 
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 What is the GPL v3?
 What is the GPL v3?

+ 2 - 2
src/Lungo.js

@@ -14,7 +14,7 @@
  *
  *
  * @copyright 2011 TapQuo Inc (c)
  * @copyright 2011 TapQuo Inc (c)
  * @license   http://www.github.com/tapquo/lungo/blob/master/LICENSE.txt
  * @license   http://www.github.com/tapquo/lungo/blob/master/LICENSE.txt
- * @version   1.2
+ * @version   2.0
  * @link      https://github.com/TapQuo/Lungo.js
  * @link      https://github.com/TapQuo/Lungo.js
  *
  *
  * @author   Javier Jimenez Villar <javi@tapquo.com> || @soyjavi
  * @author   Javier Jimenez Villar <javi@tapquo.com> || @soyjavi
@@ -23,7 +23,7 @@
 
 
 var LUNGO = LUNGO || {};
 var LUNGO = LUNGO || {};
 
 
-LUNGO.VERSION = '1.2';
+LUNGO.VERSION = '2.0';
 
 
 LUNGO.Attributes || (LUNGO.Attributes = {});
 LUNGO.Attributes || (LUNGO.Attributes = {});
 LUNGO.Data || (LUNGO.Data = {});
 LUNGO.Data || (LUNGO.Data = {});

+ 5 - 9
vendor/build.sh

@@ -77,14 +77,10 @@ echo -e "\033[0m"============================ LUNGO COMPILER ===================
         FILES_TO_JOIN=$FILES_TO_JOIN" "$DIR$file
         FILES_TO_JOIN=$FILES_TO_JOIN" "$DIR$file
     done
     done
 
 
-    #UNCOMPRESED Version
-    cat $FILES_TO_JOIN > $BUILDPATH/lungo-$VERSION.js
-    echo -e "\033[32m  [BUILD]: lungo-"$VERSION.js"\033[0m"
-
-    #MINIFIED Version
+    #COMPILED Version
     FILES_TO_COMPILE=" --js "$LUNGO_SOURCES"lib/QuoJS.js "$FILES_TO_COMPILE
     FILES_TO_COMPILE=" --js "$LUNGO_SOURCES"lib/QuoJS.js "$FILES_TO_COMPILE
-    java -jar $COMPILER $FILES_TO_COMPILE --js_output_file $BUILDPATH/lungo-$VERSION.$MINIFIED.js
-    echo -e "\033[32m  [BUILD]: lungo-"$VERSION.$MINIFIED.js"\033[0m"
+    java -jar $COMPILER $FILES_TO_COMPILE --js_output_file $BUILDPATH/lungo-$VERSION.js
+    echo -e "\033[32m  [BUILD]: lungo-"$VERSION.js"\033[0m"
 
 
 
 
 FILES_TO_COMPRESS=""
 FILES_TO_COMPRESS=""
@@ -102,7 +98,7 @@ FILES_TO_COMPRESS=""
         FILES_TO_COMPRESS=$FILES_TO_COMPRESS" "$DIR$LUNGO_NAMESPACE$file".css"
         FILES_TO_COMPRESS=$FILES_TO_COMPRESS" "$DIR$LUNGO_NAMESPACE$file".css"
     done
     done
     FILES_TO_COMPRESS=$FILES_TO_COMPRESS" "$DIR$LUNGO_NAMESPACE"widgets.icon.css"
     FILES_TO_COMPRESS=$FILES_TO_COMPRESS" "$DIR$LUNGO_NAMESPACE"widgets.icon.css"
-	cat $FILES_TO_COMPRESS > $BUILDPATH/lungo-$VERSION.$MINIFIED.css
+	cat $FILES_TO_COMPRESS > $BUILDPATH/lungo-$VERSION.css
 
 
     #for file in "${FILES[@]}"
     #for file in "${FILES[@]}"
     #do
     #do
@@ -117,5 +113,5 @@ FILES_TO_COMPRESS=""
 		echo "   - [THEME] "$file
 		echo "   - [THEME] "$file
 		cp $DIR"lungo.theme."$file $BUILDPATH'lungo.theme.'$file
 		cp $DIR"lungo.theme."$file $BUILDPATH'lungo.theme.'$file
 	done
 	done
-	echo -e "\033[32m  [BUILD]: lungo-"$VERSION.$MINIFIED".css\033[0m"
+	echo -e "\033[32m  [BUILD]: lungo-"$VERSION.".css\033[0m"
 echo ============================ /LUNGO COMPILER ============================
 echo ============================ /LUNGO COMPILER ============================