Changeset 1429


Ignore:
Timestamp:
03/18/18 07:28:17 (5 weeks ago)
Author:
gogo
Message:

Fix compressor error detection, more release cleanup

Location:
trunk/contrib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/contrib/compress_yui.php

    r1333 r1429  
    9393 
    9494        passthru("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $file_prefix.$core_prefix : $prefix)."\" > $file && java -jar {$xinha_root}/contrib/yuicompressor-2.4.2.jar  --charset UTF-8 ${file}_uncompr${ext} >> $file 2>&1"); 
    95         if (preg_match('/\d+:\d+:syntax error/',file_get_contents($file)) || preg_match('/sh: java: command not found/', file_get_contents($file))) 
     95        if (preg_match('/syntax error/',file_get_contents($file)) || preg_match('/sh: java: command not found/', file_get_contents($file))) 
    9696        { 
    9797                unlink($file); 
  • trunk/contrib/make-release.sh

    r1425 r1429  
    2929VER="$1" 
    3030 
     31# Export 
     32if [ -f /tmp/xinha-$VER ] 
     33then 
     34  echo "/tmp/xinha-$VER exists, you need to delete it first." 
     35  exit 
     36fi 
     37 
    3138# Update plugin Manifest 
    3239MANIFEST="$(bash contrib/generate-plugin-manifest.sh | sort | perl -0777 -pe 's/,\s*$//s' )" 
     
    3441mv XinhaCore2.js XinhaCore.js 
    3542 
    36 # Export 
     43 
    3744mkdir /tmp/xinha-$VER 
    3845svn export $(pwd) /tmp/xinha-$VER/xinha 
     
    106113then 
    107114  cd xinha  
    108   s3cmd --delete-removed sync ./ s3://xinha/xinha-${VER}/ 
     115  s3cmd --delete-removed --acl-public sync ./ s3://xinha/xinha-${VER}/ 
    109116  cd .. 
    110117fi 
     
    114121then 
    115122  cd xinha  
    116   s3cmd --delete-removed sync ./ s3://xinha/xinha-latest/ 
     123  s3cmd --delete-removed --acl-public sync ./ s3://xinha/xinha-latest/ 
    117124  cd .. 
    118125fi 
Note: See TracChangeset for help on using the changeset viewer.