Index: Core/mkinstalldirs =================================================================== --- Core/mkinstalldirs (revision 2087) +++ Core/mkinstalldirs (working copy) @@ -1,20 +1,32 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." + # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 + echo "$usage" exit 0 ;; -m) # -m PERM arg @@ -23,6 +35,10 @@ dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; --) # stop option processing shift break @@ -50,17 +66,37 @@ 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p -- . 2>/dev/null; then + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac @@ -84,17 +120,17 @@ mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -107,5 +143,8 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here Index: Core/configure.in =================================================================== --- Core/configure.in (revision 2087) +++ Core/configure.in (working copy) @@ -73,8 +73,8 @@ GECKOSHARP_REQUIRED_VERSION=0.5 MONODOC_REQUIRED_VERSION=1.0 -PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) -PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION) +PKG_CHECK_MODULES(BASE_DEPENDENCIES, glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION) +PKG_CHECK_MODULES(EXTRA_CRAP, monodoc >= $MONODOC_REQUIRED_VERSION) BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS} AC_SUBST(BASE_DEPENDENCIES_LIBS) @@ -86,9 +86,7 @@ LIBXML_REQUIRED=2.2.8 LIBGLADE_REQUIRED=2.0.0 PKG_CHECK_MODULES(GDLDOCK, - gtk+-2.0 >= $GTK_REQUIRED - libglade-2.0 >= $LIBGLADE_REQUIRED - libxml-2.0 >= $LIBXML_REQUIRED) + gtk+-2.0 >= $GTK_REQUIRED) AC_SUBST(GDLDOCK_CFLAGS) AC_SUBST(GDLDOCK_LIBS) Index: Core/src/MonoDevelop.cmbx =================================================================== --- Core/src/MonoDevelop.cmbx (revision 2087) +++ Core/src/MonoDevelop.cmbx (working copy) @@ -1,72 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx =================================================================== --- Core/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx (revision 2087) +++ Core/src/AddIns/DisplayBindings/SourceEditor/SourceEditor.prjx (working copy) @@ -1,109 +1,107 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmBinding.prjx =================================================================== --- Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmBinding.prjx (revision 2087) +++ Core/src/AddIns/BackendBindings/ILAsmBinding/ILAsmBinding.prjx (working copy) @@ -1,38 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.prjx =================================================================== --- Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.prjx (revision 2087) +++ Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.prjx (working copy) @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx =================================================================== --- Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx (revision 2087) +++ Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBinding.prjx (working copy) @@ -1,59 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/BackendBindings/JavaBinding/JavaBinding.prjx =================================================================== --- Core/src/AddIns/BackendBindings/JavaBinding/JavaBinding.prjx (revision 2087) +++ Core/src/AddIns/BackendBindings/JavaBinding/JavaBinding.prjx (working copy) @@ -1,58 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx =================================================================== --- Core/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx (revision 2087) +++ Core/src/AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx (working copy) @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/AddIns/Misc/StartPage/AssemblyInfo.cs.in =================================================================== --- Core/src/AddIns/Misc/StartPage/AssemblyInfo.cs.in (revision 2087) +++ Core/src/AddIns/Misc/StartPage/AssemblyInfo.cs.in (working copy) @@ -23,7 +23,7 @@ // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("@ASSEMBLY_VERSION@")] +[assembly: AssemblyVersion("0.5.1.0")] // The following attributes specify the key for the sign of your assembly. See the // .NET Framework documentation for more information about signing. Index: Core/src/AddIns/Misc/StartPage/StartPage.prjx =================================================================== --- Core/src/AddIns/Misc/StartPage/StartPage.prjx (revision 2087) +++ Core/src/AddIns/Misc/StartPage/StartPage.prjx (working copy) @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/Main/StartUp/MonoDevelop.prjx =================================================================== --- Core/src/Main/StartUp/MonoDevelop.prjx (revision 2087) +++ Core/src/Main/StartUp/MonoDevelop.prjx (working copy) @@ -1,39 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Core/src/Main/Base/MonoDevelop.Base.prjx =================================================================== --- Core/src/Main/Base/MonoDevelop.Base.prjx (revision 2087) +++ Core/src/Main/Base/MonoDevelop.Base.prjx (working copy) @@ -1,417 +1,427 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -