compilation fix

[wxWidgets.git] / distrib / msw / makedist.sh

diff --git a/distrib/msw/makedist.sh b/distrib/msw/makedist.sh
index 92a4e56fe1850dc447cc99ba212e70db1a31b4db..f0e62df8467b316d734781678f39982030779abb 100644 (file)
--- a/distrib/msw/makedist.sh
+++ b/distrib/msw/makedist.sh
@@ -1,7 +1,7 @@
-#! /bin/sh
+#! /bin/bash

 # makedist.sh
 #
 # makedist.sh
 #

-# Build wxWindows 2 for Windows distribution.
+# Build wxWidgets 2 for Windows distribution.

 # This builds all required binaries and documents before calling
 # zipdist.sh to make the archives.
 #
 # This builds all required binaries and documents before calling
 # zipdist.sh to make the archives.
 #


@@ -19,7 +19,7 @@
 # - update the readmes, change log, manual version etc.
 # - update version.h
 # - update distrib/msw/wisetop.txt, wisebott.txt with the correct version
 # - update the readmes, change log, manual version etc.
 # - update version.h
 # - update distrib/msw/wisetop.txt, wisebott.txt with the correct version

-#   number, plus any hard-wired wxWindows paths
+#   number, plus any hard-wired wxWidgets paths

 # - test on a variety of compilers
 #
 # TODO:
 # - test on a variety of compilers
 #
 # TODO:


@@ -96,12 +96,9 @@ check_files() {
 build_docs() {
     cd "$SRC/src/msw"
     echo "---------------------------------"
 build_docs() {
     cd "$SRC/src/msw"
     echo "---------------------------------"

-    echo "Building wxWindows documents"
+    echo "Building wxWidgets documents"

     nmake -f makefile.vc cleandocs docs
 
     nmake -f makefile.vc cleandocs docs
 

-    cd "$SRC/utils/dialoged/src"
-    nmake -f makefile.vc html htmlhelp htb hlp pdfrtf
-

     cd "$SRC/utils/tex2rtf/src"
     nmake -f makefile.vc html htmlhelp htb hlp pdfrtf
 
     cd "$SRC/utils/tex2rtf/src"
     nmake -f makefile.vc html htmlhelp htb hlp pdfrtf
 


@@ -116,10 +113,9 @@ build_docs() {
 # This has to be interactive at present.
 build_pdf() {
     echo "---------------------------------"
 # This has to be interactive at present.
 build_pdf() {
     echo "---------------------------------"

-    echo "Building wxWindows PDF documents"
+    echo "Building wxWidgets PDF documents"

     if [ -e "$WORDEXE" ]; then
         "$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf"
     if [ -e "$WORDEXE" ]; then
         "$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf"

-        "$WORDEXE" "$WXWIN\\docs\\pdf\\dialoged.rtf"

         "$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf"
         "$WORDEXE" "$WXWIN\\contrib\\docs\\pdf\\ogl.rtf"
         "$WORDEXE" "$WXWIN\\contrib\\docs\\mmedia\\ogl.rtf"
         "$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf"
         "$WORDEXE" "$WXWIN\\contrib\\docs\\pdf\\ogl.rtf"
         "$WORDEXE" "$WXWIN\\contrib\\docs\\mmedia\\ogl.rtf"


@@ -128,25 +124,16 @@ build_pdf() {
     fi
 }
 
     fi
 }
 

-# Build wxWindows
+# Build wxWidgets

 build_wxwin_vc() {
     echo "---------------------------------"
 build_wxwin_vc() {
     echo "---------------------------------"

-    echo "Building wxWindows using VC++"
+    echo "Building wxWidgets using VC++"

     cd "$SRC/src"
     cd "$SRC/src"

-    echo Building wxWindows Release library in `pwd`
+    echo Building wxWidgets Release library in `pwd`

     echo Command: msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild
     msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild | egrep -v "$WARNINGS"
 }
 
     echo Command: msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild
     msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild | egrep -v "$WARNINGS"
 }
 

-build_dialog_editor() {
-    echo "---------------------------------"
-    echo "Building Dialog Editor using VC++"
-    cd "$SRC/utils/dialoged/src"
-    msdev DialogEdVC.dsw /useenv /make "DialogEdVC - Win32 Release" /rebuild | egrep -v "$WARNINGS" | tee $TMPDIR/buildlog.txt
-
-    check_compile "Dialog Editor"
-}
-

 build_tex2rtf() {
     echo "---------------------------------"
     echo "Building Tex2RTF using VC++"
 build_tex2rtf() {
     echo "---------------------------------"
     echo "Building Tex2RTF using VC++"


@@ -166,15 +153,11 @@ build_life() {
 }
 
 build_executables() {
 }
 
 build_executables() {

-    build_dialog_editor

     build_tex2rtf
     build_life
 }
 
 copy_files() {
     build_tex2rtf
     build_life
 }
 
 copy_files() {

-    cp "$SRC/utils/dialoged/src/Release/dialoged.exe" "$SRC/bin"
-    cp "$SRC/docs/winhelp/dialoged.hlp" "$SRC/docs/winhelp/dialoged.cnt" "$SRC/bin"
-

     cp "$SRC/utils/tex2rtf/src/Release/tex2rtf.exe" "$SRC/bin"
     cp "$SRC/docs/winhelp/tex2rtf.hlp" "$SRC/docs/winhelp/tex2rtf.cnt" "$SRC/bin"
 
     cp "$SRC/utils/tex2rtf/src/Release/tex2rtf.exe" "$SRC/bin"
     cp "$SRC/docs/winhelp/tex2rtf.hlp" "$SRC/docs/winhelp/tex2rtf.cnt" "$SRC/bin"