Changeset 2496

Timestamp:

08/17/08 17:07:51 (4 months ago)

Author:

jhasse

Message:

Fixing #55 and #66

Files:

• main/trunk/ChangeLog (modified) (1 diff)
• main/trunk/libexec/Makefile (modified) (1 diff)
• main/trunk/libexec/monotester.cs (added)
• main/trunk/makepackage (modified) (5 diffs)
• main/trunk/release/autopackage-build (modified) (2 diffs)

main/trunk/ChangeLog

@@ +1 @@
+2008-08-17  Jan Niklas Hasse <jhasse@gmail.com>
+
+        * release/autopackage-build: Checking for monotester.exe. Also adding new
+        binary "autopackage-curl" to the developer tarball.
+        * makepackage: Replace @ in variable names with __at__ so that bash doesn't
+        complain about it. Fixes #55
+        * libexec/monotester.cs: Adding Isak's mono test program. Fixes #66
+        * libexec/Makefile: Try to compile monotester.cs and warn if the mono C#
+        compiler is missing
+
-2008-08-17  Jan Niklas Hasse <jhasse@gmail.com>
-

main/trunk/libexec/Makefile

@@ -4 +4 @@
-CC_MAJOR_VERSION:=$(shell $(CC) -dumpversion | cut -f 1 -d.)
-NO_POINTER_SIGN:=$(shell test $(CC_MAJOR_VERSION) -ge 4 && echo "-Wno-pointer-sign")
-
+
+
+
+
+
-
-all:    $(PROGS)
+
+monotester.exe: monotester.cs
+        @if [ $$(which $(MCS)) ];then $(MCS) /out:monotester.exe $(MCSFLAGS) monotester.cs; else echo "\033[1;31mWARNING: \033[0m$(MCS): not found. Continuing without compiling monotester.exe"; fi
-
-readlink: readlink.c

main/trunk/makepackage

@@ -543 +543 @@
-
-                        local line=`echo "$meta_localized" | grep -i "^$1:" | head -n 1`
-
+ | sed 's/@/\_\_at\_\_/g'
-                        local value=`echo "$line" | awk 'BEGIN { FS=": " } { print $2 }'`
-                        # continue if the specKey is found in the Meta section keys
@@ -573 +573 @@
-                # Summary: <data>               --->    SUMMARY="<data>"
-                # Summary[fr]: <data>           --->    SUMMARY_fr="<data>"
-
+__at__Latn
-                #
-                # allow ':' to be used in Meta data, need to focus on the first instance of ':'
-                # first instance can be determined on localized keys because of the ']: ' so substitute in '='
-                # and non-localized keys are converted to variables in subup function
-                meta_localized=`echo "$meta_localized" | sed 's/@.*\]/\]/g'`
-                meta_localized=`echo "$meta_localized" | sed 's/\]: /\=\"/g'`
-                meta_localized=`echo "$meta_localized" | sed 's/\(.\)$/\1"/g'`
@@ -1790 +1789 @@
-                meta_desktop_languages="en"
-                for line in $meta_names $meta_comments; do
- | sed 's/@.*//g'
+
-                        meta_desktop_languages=`echo "$meta_desktop_languages"; echo "$meta_desktop_language_add"`
-                done
-
-                # convert Name to DISPLAYNAME
-
+ | sed 's/@/\_\_at\_\_/g'
-                [[ "$meta_names" != "" ]] && meta_names=`echo "$meta_names" | sed 's/$/"/g' | sed 's/^DISPLAYNAME\=/DISPLAYNAME\=\"/g'`
-                # check to see if DISPLAYNAME_en is available and if not use DISPLAYNAME instead and write DISPLAYNAME_en to $meta_names
-                meta_name_en=`echo "$meta_names" | grep '^DISPLAYNAME_en=' | awk 'BEGIN { FS="=" } { print $2 }'`
-                
-                encoding_lines=`echo "$meta_names" | grep '@.*='`
-                for line in $encoding_lines; do
-                        # find any translations that have @ (encoding) markings
-                        if echo "$meta_names" | grep -q `echo "$line" | sed 's/@.*=.*/=/g'`; then
-                                # drop if there's already a translation w/o encoding marking
-                                meta_names=`echo "$meta_names" | sed "s/$line//g"`
-                        else
-                                # there's no translation for this language, so use it
-                                # (we can't handle @s)
-                                old_encoding=`echo "$line" | sed 's/.*\(_.*@.*\)=.*/\1/g'`
-                                new_encoding=`echo "$old_encoding" | sed 's/@.*//g'`
-                                meta_names=`echo "$meta_names" | sed "s/$old_encoding/$new_encoding/g"`
-                                
-                        fi
-                done
-                
-                if [ "$meta_name_en" == "" ]; then
-                        meta_name_en=`echo "$meta_names" | grep '^DISPLAYNAME=' | awk 'BEGIN { FS="=" } { print $2 }'`
@@ -1823 +1805 @@
-
-                # convert Comment to SUMMARY
-
+ | sed 's/@/\_\_at\_\_/g'
-                [[ "$meta_comments" != "" ]] && meta_comments=`echo "$meta_comments" | sed 's/$/"/g' | sed 's/^SUMMARY\=/SUMMARY\=\"/g'`
-                # check to see if SUMMARY_en is available and if not use SUMMARY instead and write SUMMARY_en to $meta_comments
-                meta_comment_en=`echo "$meta_comments" | grep '^SUMMARY_en=' | awk 'BEGIN { FS="=" } { print $2 }'`
-                
-                encoding_lines=`echo "$meta_comments" | grep '@.*='`
-                for line in $encoding_lines; do
-                        # find any translations that have @ (encoding) markings
-                        if echo "$meta_comments" | grep -q `echo "$line" | sed 's/@.*=.*/=/g'`; then
-                                # drop if there's already a translation w/o encoding marking
-                                meta_comments=`echo "$meta_comments" | sed "s/$line//g"`
-                        else
-                                # there's no translation for this language, so use it
-                                # (we can't handle @s)
-                                old_encoding=`echo "$line" | sed 's/.*\(_.*@.*\)=.*/\1/g'`
-                                new_encoding=`echo "$old_encoding" | sed 's/@.*//g'`
-                                meta_comments=`echo "$meta_comments" | sed "s/$old_encoding/$new_encoding/g"`
-                        fi
-                done
-                
-                if [ "$meta_comment_en" == "" ]; then
-                        meta_comment_en=`echo "$meta_comments" | grep '^SUMMARY=' | awk 'BEGIN { FS="=" } { print $2 }'`
@@ -1961 +1927 @@
-                                text=`echo "${!b}"`
-                        else
-{language}
+(echo ${language} | sed 's/@/\_\_at\_\_/g')
-                                text=`echo "${!b}"`
-                                if [ -z "$text" ]; then

main/trunk/release/autopackage-build

@@ -319 +319 @@
-                make > /dev/null 2>&1
-        fi
-
+
+
+
+
-else
-        ! "$autopackage_silent" && out "Making libexec executables ... skipped ... "
@@ -450 +453 @@
-        cp -rf "$apkg_dir/lzma"                                 "$apkg_build_dir/autopackage/"
-        cp -rf "$apkg_dir/main/share/"                          "$apkg_build_dir/autopackage/"
-
+ autopackage-curl
-            cp  -f "$apkg_dir/main/libexec/$f"                  "$apkg_build_dir/autopackage/libexec/"
-        done