Attachment 24653 Details for Bug 37609 – a patch for MUTE 0.2.2-rc2

[patch] a patch for MUTE 0.2.2-rc2

mute-0.2.2-gentoo.diff (text/plain), 12.87 KB, created by Ludovic CINTRAT on 2004-01-30 11:02:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludovic CINTRAT

Created: 2004-01-30 11:02:36 UTC

Size: 12.87 KB

patch

obsolete

>diff -Naurp MUTE_fileSharing-0.2.2-rc2_UnixSource.orig/MUTE/configure MUTE_fileSharing-0.2.2-rc2_UnixSource/MUTE/configure
>--- MUTE_fileSharing-0.2.2-rc2_UnixSource.orig/MUTE/configure	2004-01-30 19:31:48.000000000 +0100
>+++ MUTE_fileSharing-0.2.2-rc2_UnixSource/MUTE/configure	2004-01-30 19:32:27.000000000 +0100
>@@ -35,53 +35,14 @@
> #
> 
> 
>-while [ -z "$userEntry" ]
>-do
>-    echo "select platform:"
>-
>-    echo "  1 --  GNU/Linux X86"
>-    echo "  2 --  GNU/Linux PPC"
>-    echo "  3 --  FreeBSD X86"
>-    echo "  4 --  MacOSX"
>-    echo "  5 --  Solaris"
>-    echo "  6 --  Win32 using MinGW"
>-    echo "  q --  quit"
>-
>-    echo ""
>-    echo -n "> "
>-
>-    read userEntry
>-
>-	
>-	if [ "$userEntry" = "q" ]
>-    then
>-        exit
>-    fi
>-
>-
>-    # use ASCII comparison.
>-
>-	if [[ "$userEntry" > "6" ]]
>-    then
>-        userEntry=""
>-    fi
>-
>-    if [[ "$userEntry" < "1" ]]
>-    then
>-        userEntry=""
>-    fi
>-
>-done
>-
>-
> # only needed for win32 at the moment (-lwsock32)
> extraWxLibs=""
> 
> 
>-case "$userEntry" in
>+case "$1" in
> 
> 
>-    "1" )
>+    "x86" )
> 
>         rm -f Makefile.temp
>         echo "# Auto-generated by MUTE/configure for GNU/Linux X86 platform.  Do not edit manually." > Makefile.temp
>@@ -121,7 +82,7 @@ case "$userEntry" in
> 
> 
> 
>-    "2" )
>+    "ppc" )
> 
>         rm -f Makefile.temp
>         echo "# Auto-generated by MUTE/configure for GNU/Linux PPC platform.  Do not edit manually." > Makefile.temp
>@@ -159,190 +120,8 @@ case "$userEntry" in
>         rm Makefile.temp
>     ;;
> 
>-
>-
>-    "3" )
>-
>-        rm -f Makefile.temp
>-        echo "# Auto-generated by MUTE/configure for FreeBSD X86 platform.  Do not edit manually." > Makefile.temp
>-
>-        #rm -f kast/Makefile
>-        #cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems kast/Makefile.all kast/Makefile.other Makefile.minorGems_targets > kast/Makefile
>-
>-        rm -f layers/messageRouting/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems layers/messageRouting/Makefile.all Makefile.minorGems_targets > layers/messageRouting/Makefile
>-
>-        rm -f layers/pointToPoint/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems layers/pointToPoint/Makefile.all Makefile.minorGems_targets > layers/pointToPoint/Makefile
>-
>-        rm -f layers/fileTransfer/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems layers/fileTransfer/Makefile.all Makefile.minorGems_targets > layers/fileTransfer/Makefile
>-
>-        rm -f userInterface/fileTransferWebInterface/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems userInterface/fileTransferWebInterface/Makefile.all Makefile.minorGems_targets > userInterface/fileTransferWebInterface/Makefile
>-
>-        rm -f userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems userInterface/textBased/Makefile.all Makefile.minorGems_targets > userInterface/textBased/Makefile
>-
>-        rm -f otherApps/fileSharing/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems otherApps/fileSharing/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/Makefile
>-
>-        rm -f otherApps/fileSharing/userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems otherApps/fileSharing/userInterface/textBased/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/userInterface/textBased/Makefile
>-
>-        rm -f crypto/Makefile
>-        cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems crypto/Makefile.all Makefile.minorGems_targets > crypto/Makefile
>-
>-        #rm -f katcher/Makefile
>-        #cat Makefile.temp Makefile.FreeBSDX86 Makefile.common Makefile.minorGems katcher/Makefile.all katcher/Makefile.other Makefile.minorGems_targets > katcher/Makefile
>-
>-        rm Makefile.temp
>-    ;;
>-
>-
>-
>-    "4" )
>-
>-        rm -f Makefile.temp
>-        echo "# Auto-generated by MUTE/configure for MacOSX platform.  Do not edit manually." > Makefile.temp
>-
>-        #rm -f kast/Makefile
>-        #cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems kast/Makefile.all kast/Makefile.MacOSX Makefile.minorGems_targets > kast/Makefile
>-
>-        rm -f layers/messageRouting/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems layers/messageRouting/Makefile.all Makefile.minorGems_targets > layers/messageRouting/Makefile
>-
>-        rm -f layers/pointToPoint/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems layers/pointToPoint/Makefile.all Makefile.minorGems_targets > layers/pointToPoint/Makefile
>-
>-        rm -f layers/fileTransfer/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems layers/fileTransfer/Makefile.all Makefile.minorGems_targets > layers/fileTransfer/Makefile
>-
>-        rm -f userInterface/fileTransferWebInterface/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems userInterface/fileTransferWebInterface/Makefile.all Makefile.minorGems_targets > userInterface/fileTransferWebInterface/Makefile
>-
>-        rm -f userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems userInterface/textBased/Makefile.all Makefile.minorGems_targets > userInterface/textBased/Makefile
>-
>-        rm -f otherApps/fileSharing/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems otherApps/fileSharing/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/Makefile
>-
>-        rm -f otherApps/fileSharing/userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems otherApps/fileSharing/userInterface/textBased/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/userInterface/textBased/Makefile
>-
>-        rm -f crypto/Makefile
>-        cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems crypto/Makefile.all Makefile.minorGems_targets > crypto/Makefile
>-
>-        #rm -f katcher/Makefile
>-        #cat Makefile.temp Makefile.MacOSX Makefile.common Makefile.minorGems katcher/Makefile.all katcher/Makefile.MacOSX Makefile.minorGems_targets > katcher/Makefile
>-
>-        rm Makefile.temp
>-    ;;
>-
>-
>-
>-    "5" )
>-
>-        rm -f Makefile.temp
>-        echo "# Auto-generated by MUTE/configure for Solaris platform.  Do not edit manually." > Makefile.temp
>-
>-        #rm -f kast/Makefile
>-        #cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems kast/Makefile.all kast/Makefile.other Makefile.minorGems_targets > kast/Makefile
>-
>-        rm -f layers/messageRouting/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems layers/messageRouting/Makefile.all Makefile.minorGems_targets > layers/messageRouting/Makefile
>-
>-        rm -f layers/pointToPoint/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems layers/pointToPoint/Makefile.all Makefile.minorGems_targets > layers/pointToPoint/Makefile
>-
>-        rm -f layers/fileTransfer/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems layers/fileTransfer/Makefile.all Makefile.minorGems_targets > layers/fileTransfer/Makefile
>-
>-        rm -f userInterface/fileTransferWebInterface/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems userInterface/fileTransferWebInterface/Makefile.all Makefile.minorGems_targets > userInterface/fileTransferWebInterface/Makefile
>-
>-        rm -f userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems userInterface/textBased/Makefile.all Makefile.minorGems_targets > userInterface/textBased/Makefile
>-
>-        rm -f otherApps/fileSharing/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems otherApps/fileSharing/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/Makefile
>-
>-        rm -f otherApps/fileSharing/userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems otherApps/fileSharing/userInterface/textBased/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/userInterface/textBased/Makefile
>-
>-        rm -f crypto/Makefile
>-        cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems crypto/Makefile.all Makefile.minorGems_targets > crypto/Makefile
>-
>-        #rm -f katcher/Makefile
>-        #cat Makefile.temp Makefile.Solaris Makefile.common Makefile.minorGems katcher/Makefile.all katcher/Makefile.other Makefile.minorGems_targets > katcher/Makefile
>-
>-        rm Makefile.temp
>-    ;;
>-
>-
>-
>-
>-    "6" )
>-
>-        rm -f Makefile.temp
>-        echo "# Auto-generated by MUTE/configure for Win32 MinGW platform.  Do not edit manually." > Makefile.temp
>-
>-        #rm -f kast/Makefile
>-        #cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems kast/Makefile.all kast/Makefile.other Makefile.minorGems_targets > kast/Makefile
>-
>-        rm -f layers/messageRouting/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems layers/messageRouting/Makefile.all Makefile.minorGems_targets > layers/messageRouting/Makefile
>-
>-        rm -f layers/pointToPoint/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems layers/pointToPoint/Makefile.all Makefile.minorGems_targets > layers/pointToPoint/Makefile
>-
>-        rm -f layers/fileTransfer/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems layers/fileTransfer/Makefile.all Makefile.minorGems_targets > layers/fileTransfer/Makefile
>-
>-        rm -f userInterface/fileTransferWebInterface/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems userInterface/fileTransferWebInterface/Makefile.all Makefile.minorGems_targets > userInterface/fileTransferWebInterface/Makefile
>-
>-        rm -f userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems userInterface/textBased/Makefile.all Makefile.minorGems_targets > userInterface/textBased/Makefile
>-
>-        rm -f otherApps/fileSharing/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems otherApps/fileSharing/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/Makefile
>-
>-        rm -f otherApps/fileSharing/userInterface/textBased/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems otherApps/fileSharing/userInterface/textBased/Makefile.all Makefile.minorGems_targets > otherApps/fileSharing/userInterface/textBased/Makefile
>-
>-        rm -f crypto/Makefile
>-        cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems crypto/Makefile.all Makefile.minorGems_targets > crypto/Makefile
>-
>-        #rm -f katcher/Makefile
>-        #cat Makefile.temp Makefile.MinGW Makefile.common Makefile.minorGems katcher/Makefile.all katcher/Makefile.other Makefile.minorGems_targets > katcher/Makefile
>-
>-        rm Makefile.temp
>-
>-
>-        # need winsock library
>-       	extraWxLibs="-lwsock32"
>-    ;;
>-
>-
>-
>-
> esac
> 
>-
>-echo ""
>-echo ""
>-echo "Enter full path to wxWindows wx-config script."
>-echo "   Example:   /usr/bin/wx-config"
>-echo "To us the default setting, or if you do not plan to build the"
>-echo "wxWindows-based GUI, leave this blank."
>-
>-echo ""
>-echo -n "> "
>-
>-read userEntry
>-
>-
> if [ "$userEntry" = "" ]
> then
>     userEntry="/usr/bin/wx-config"
>diff -Naurp MUTE_fileSharing-0.2.2-rc2_UnixSource.orig/runToBuild MUTE_fileSharing-0.2.2-rc2_UnixSource/runToBuild
>--- MUTE_fileSharing-0.2.2-rc2_UnixSource.orig/runToBuild	2004-01-30 19:31:37.000000000 +0100
>+++ MUTE_fileSharing-0.2.2-rc2_UnixSource/runToBuild	2004-01-30 19:32:06.000000000 +0100
>@@ -11,46 +11,7 @@
> 
> cd MUTE
> chmod u+x ./configure
>-./configure
>-
>-
>-
>-while [ -z "$userEntry" ]
>-do
>-    echo ""
>-    echo ""
>-    echo "select build:"
>-
>-    echo "  1 --  wxWindows graphical UI"
>-    echo "  2 --  Console-only text UI"
>-    echo "  q --  quit"
>-
>-    echo ""
>-    echo -n "> "
>-
>-    read userEntry
>-
>-	
>-	if [ "$userEntry" = "q" ]
>-    then
>-        exit
>-    fi
>-
>-
>-    # use ASCII comparison.
>-
>-	if [[ "$userEntry" > "2" ]]
>-    then
>-        userEntry=""
>-    fi
>-
>-    if [[ "$userEntry" < "1" ]]
>-    then
>-        userEntry=""
>-    fi
>-
>-done
>-
>+./configure $2
> 
> cd crypto
> make libcrypto.a
>@@ -61,9 +22,9 @@ make libmuteMessageRouter.a
> cd ../../otherApps/fileSharing
> make libmuteFileShare.a
> 
>-case "$userEntry" in
>+case "$1" in
> 
>-    "1" )
>+    "gtk" )
>         cd userInterface/wxWindows
>         make
>         cd build
>@@ -75,7 +36,7 @@ case "$userEntry" in
>         cd ../../../../../../
>     ;;
> 
>-    "2" )
>+    "text" )
>         cd userInterface/textBased
>         make
>         cd build
>@@ -87,4 +48,4 @@ case "$userEntry" in
>         cd ../../../../../../
>     ;;
> 
>-esac
>\ No newline at end of file
>+esac

Actions: View | Diff

Attachments on bug 37609: 23383 | 23384 | 24436 | 24437 | 24652 | 24653 | 34683 | 34684