Changeset 15984 for lang/cplusplus

Timestamp:

07/18/08 14:38:01 (5 years ago)

Author:

saturday06

Message:

厳しくエラー出すようにした

Location:

lang/cplusplus/i3/windows

Files:

• dist.rb (modified) (2 diffs)
• locale.rb (modified) (3 diffs)

lang/cplusplus/i3/windows/dist.rb

@@ -14 +14 @@
 CRLF = "perl -pe 's/\\n/\\r\\n/g'"
 
-system(<<SHELLSCRIPT)
+def system2(str)
+        system(str.strip.split(/(\r|\r\n|\n)/).
+                map{|s| s.gsub(/#.*$/, "")}.
+                delete_if{|s| s.strip.empty?}.join(" && "))
+end
+
+s = system2(<<SHELLSCRIPT)
 make windows-locale
 rm -rf #{DIR}
@@ -30 +36 @@
 pushd .
 cd windows/dist/
-rm #{ZIP_NAME}
+rm -f #{ZIP_NAME}
 zip -gr #{ZIP_NAME} #{ZIP_DIR}
 popd
 SHELLSCRIPT
+
+if !s
+        exit 1
+end

lang/cplusplus/i3/windows/locale.rb

@@ -8 +8 @@
 #localedir = ARGV.shift
 
+def system2(str)
+        system(str.strip.split(/(\r|\r\n|\n)/).
+                map{|s| s.gsub(/#.*$/, "")}.
+                delete_if{|s| s.strip.empty?}.join(" && "))
+end
+
 # localeの名前XXXの配列, ファイルから読み込み
 linguas   = []
@@ -15 +21 @@
 
 # update po XXX install??
-system(<<SHELLSCRIPT)
+s = system2(<<SHELLSCRIPT)
 sh sh/potfiles.sh
 cd po
@@ -25 +31 @@
 rm -rf windows/bin/locale/
 SHELLSCRIPT
+if !s
+        exit 1
+end
 
 # localeの名前XXX毎の処理
 linguas.each do |lang|
-        system(<<SHELLSCRIPT)
+        s = system2(<<SHELLSCRIPT)
 mkdir -p locale/#{lang}/LC_MESSAGES
-cp -f po/#{lang}.gmo locale/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.mo
-cp -f po/#{lang}.po  locale/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.po
-cp -rf locale windows/bin/
+cp po/#{lang}.gmo locale/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.mo
+cp po/#{lang}.po  locale/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.po
+cp -r locale windows/bin/
 SHELLSCRIPT
 #cp -f #{localedir}/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.mo locale/#{lang}/LC_MESSAGES/#{PACKAGE_NAME}.mo
 
+        if !s
+                exit 1
+        end
 end