Ticket #268: autoencode.diff

build/lib/jManifest.class.php

@@ -33 +33 @@
-
-        foreach($script as $nbline=>$line){
-            $nbline++;
-
+|#
-                if($m[1] == 'dd'){
-                    $currentdestdir = jBuildUtils::normalizeDir($m[2]);
-                    jBuildUtils::createDir($distdir.$currentdestdir);
@@ -46 +46 @@
-                }else{
-                    $doPreprocessing = (strpos($m[1],'*') !== false);
-                    $doCompression = (strpos($m[1],'c') !== false) || ($stripcomment && (strpos($m[1],'!') === false));
+                    $doAddCharset = (strpos($m[1],'#') !== false);
-
-                    if($m[2] == ''){
-                        throw new Exception ( "$ficlist : file required on line $nbline \n");
@@ -90 +91 @@
-                        $script = file_get_contents($sourcefile);
-                        $packer = new JavaScriptPacker($script, 0, true, false);
-                        file_put_contents($destfile, $packer->pack());
+                    }elseif($doAddCharset) {
+                        if($verbose)
+                            echo "copy  ".$sourcedir.$currentsrcdir.$m[2]."\tto\t".$destfile."\n";
+                            
+                        $encoding = array('ISO-8859-1', 'ISO-8859-15', 'UTF-8');
+
+                        if(copy($sourcefile, $destfile)) {
+                            
+                            $content = file_get_contents( $destfile );
+                            $encode = mb_detect_encoding( $content );
+                            
+                            foreach ( $encoding as $val ) {
+                                if( strpos($m[2], $val.'.properties') === false ) {
+                                    
+                                    $encodefile = implode($val, explode($encode, $destfile));
+                                    
+                                    if($verbose)
+                                        echo "encode into  ".$encodefile."\n";
+                                    
+                                    $file = fopen($encodefile, "w");
+                                    fwrite($file, mb_convert_encoding($content, $val, $encode));
+                                    fclose($file);
+                                    
+                                }
+                            }
+                            
+                        } else {
+                            throw new Exception ( "$ficlist : cannot copy file ".$m[2].", line $nbline \n");
+                        }
-                    }else{
-                        if($verbose)
-                            echo "copy  ".$sourcedir.$currentsrcdir.$m[2]."\tto\t".$destfile."\n";

build/manifests/jelix-lib.mn

@@ -198 +198 @@
-  ui.ISO-8859-15.properties
-  ui.UTF-8.properties
-cd lib/jelix/core-modules/jelix/locales/fr_FR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-cd lib/jelix/core-modules/jelix/templates
-  404.xul.tpl
-  403.html.tpl