Patch from David Fiddes <D.J@fiddes.surfaid.org> which adds basic

Cygwin support to the RPM scripts.  The patch from David did not
apply cleanly and Joel ended up making all the modifications
plus some it should have included for consistency by hand.  His comments:

    I've included a diff against the last (19991203) snapshot RPM scripts that
    adds what I think is required for Cygwin support. Basically all this boils
    down to is adding EXE extension support. I've added the AC_EXEEXT rule to
    conifgure.in (requires a valid 'cc' to work - this is not available in the
    standard Cygwin distro). Each of the *.spec.in have @exe_ext@ includes in
    them for each program that results in an EXE. The only odity here is that
    the chill driver program is a shell script and thus does not require .exe to
    be added... The mk*.in have all been updated to process the new exe_ext
    rule.

11 files changed, 74 insertions, 62 deletions

diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index 5655bab4a4..b214653630 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -121,20 +121,20 @@ Authors:
 %doc /opt/rtems/man/man1/@target_alias@-*.1
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-addr2line
-/opt/rtems/bin/@target_alias@-ar
-/opt/rtems/bin/@target_alias@-as
-/opt/rtems/bin/@target_alias@-c++filt
-/opt/rtems/bin/@target_alias@-gasp
-/opt/rtems/bin/@target_alias@-ld
-/opt/rtems/bin/@target_alias@-nm
-/opt/rtems/bin/@target_alias@-objcopy
-/opt/rtems/bin/@target_alias@-objdump
-/opt/rtems/bin/@target_alias@-ranlib
-/opt/rtems/bin/@target_alias@-readelf
-/opt/rtems/bin/@target_alias@-size
-/opt/rtems/bin/@target_alias@-strings
-/opt/rtems/bin/@target_alias@-strip
+/opt/rtems/bin/@target_alias@-addr2line@exe_ext@
+/opt/rtems/bin/@target_alias@-ar@exe_ext@
+/opt/rtems/bin/@target_alias@-as@exe_ext@
+/opt/rtems/bin/@target_alias@-c++filt@exe_ext@
+/opt/rtems/bin/@target_alias@-gasp@exe_ext@
+/opt/rtems/bin/@target_alias@-ld@exe_ext@
+/opt/rtems/bin/@target_alias@-nm@exe_ext@
+/opt/rtems/bin/@target_alias@-objcopy@exe_ext@
+/opt/rtems/bin/@target_alias@-objdump@exe_ext@
+/opt/rtems/bin/@target_alias@-ranlib@exe_ext@
+/opt/rtems/bin/@target_alias@-readelf@exe_ext@
+/opt/rtems/bin/@target_alias@-size@exe_ext@
+/opt/rtems/bin/@target_alias@-strings@exe_ext@
+/opt/rtems/bin/@target_alias@-strip@exe_ext@
 
 %dir /opt/rtems/include
 /opt/rtems/include/bfd.h
@@ -151,12 +151,12 @@ Authors:
 
 %dir /opt/rtems/@target_alias@
 %dir /opt/rtems/@target_alias@/bin
-/opt/rtems/@target_alias@/bin/ar
-/opt/rtems/@target_alias@/bin/as
-/opt/rtems/@target_alias@/bin/ld
-/opt/rtems/@target_alias@/bin/nm
-/opt/rtems/@target_alias@/bin/ranlib
-/opt/rtems/@target_alias@/bin/strip
+/opt/rtems/@target_alias@/bin/ar@exe_ext@
+/opt/rtems/@target_alias@/bin/as@exe_ext@
+/opt/rtems/@target_alias@/bin/ld@exe_ext@
+/opt/rtems/@target_alias@/bin/nm@exe_ext@
+/opt/rtems/@target_alias@/bin/ranlib@exe_ext@
+/opt/rtems/@target_alias@/bin/strip@exe_ext@
 
 %dir /opt/rtems/@target_alias@/lib
 /opt/rtems/@target_alias@/lib/ldscripts
diff --git a/scripts/configure.in b/scripts/configure.in
index 73df2f7a74..bfa8872d7a 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -3,6 +3,8 @@
 AC_INIT(binutils)
 AM_INIT_AUTOMAKE(scripts,19991025-0,no)
 
+AC_EXEEXT
+
 test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
 
diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in
index 2a8fa1ef3b..a4cc4d9fa3 100644
--- a/scripts/gccnewlib/gccnewlib.spec.in
+++ b/scripts/gccnewlib/gccnewlib.spec.in
@@ -203,13 +203,13 @@ This is the gcc/objc compiler for @target_alias@
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/cpp
-/opt/rtems/bin/gcov
-/opt/rtems/bin/@target_alias@-c++
-/opt/rtems/bin/@target_alias@-g++
-/opt/rtems/bin/@target_alias@-gcc
-/opt/rtems/bin/@target_alias@-protoize
-/opt/rtems/bin/@target_alias@-unprotoize
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+/opt/rtems/bin/@target_alias@-c++@exe_ext@
+/opt/rtems/bin/@target_alias@-g++@exe_ext@
+/opt/rtems/bin/@target_alias@-gcc@exe_ext@
+/opt/rtems/bin/@target_alias@-protoize@exe_ext@
+/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
@@ -269,10 +269,10 @@ This is the gcc/objc compiler for @target_alias@
 
 %files -n @target_alias@-gcj -f build/files.gcj
 %dir /opt/rtems/bin
-/opt/rtems/bin/jcf-dump
-/opt/rtems/bin/jv-scan
-/opt/rtems/bin/gcjh
-/opt/rtems/bin/@target_alias@-gcj
+/opt/rtems/bin/jcf-dump@exe_ext@
+/opt/rtems/bin/jv-scan@exe_ext@
+/opt/rtems/bin/gcjh@exe_ext@
+/opt/rtems/bin/@target_alias@-gcj@exe_ext@
 
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain
@@ -280,7 +280,7 @@ This is the gcc/objc compiler for @target_alias@
 
 %files -n @target_alias@-g77 -f build/files.g77
 %dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-g77
+/opt/rtems/bin/@target_alias@-g77@exe_ext@
 
 %dir /opt/rtems/info
 %doc /opt/rtems/info/g77.info*
@@ -289,7 +289,7 @@ This is the gcc/objc compiler for @target_alias@
 %dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-g77.1
 
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
 
 %post -n @target_alias@-g77
   if test -d $RPM_INSTALL_PREFIX/rtems/info; 
@@ -313,5 +313,5 @@ This is the gcc/objc compiler for @target_alias@
 
 
 %files -n @target_alias@-objc -f build/files.objc
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
diff --git a/scripts/gccnewlib/gccnewlib_c_only.spec.in b/scripts/gccnewlib/gccnewlib_c_only.spec.in
index 69f34b8a19..4f0fd44a5d 100644
--- a/scripts/gccnewlib/gccnewlib_c_only.spec.in
+++ b/scripts/gccnewlib/gccnewlib_c_only.spec.in
@@ -137,13 +137,13 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/cpp
-/opt/rtems/bin/gcov
-/opt/rtems/bin/@target_alias@-c++
-/opt/rtems/bin/@target_alias@-g++
-/opt/rtems/bin/@target_alias@-gcc
-/opt/rtems/bin/@target_alias@-protoize
-/opt/rtems/bin/@target_alias@-unprotoize
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+/opt/rtems/bin/@target_alias@-c++@exe_ext@
+/opt/rtems/bin/@target_alias@-g++@exe_ext@
+/opt/rtems/bin/@target_alias@-gcc@exe_ext@
+/opt/rtems/bin/@target_alias@-protoize@exe_ext@
+/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
diff --git a/scripts/gdb/gdb.spec.in b/scripts/gdb/gdb.spec.in
index 2aa4b534e6..f01266f803 100644
--- a/scripts/gdb/gdb.spec.in
+++ b/scripts/gdb/gdb.spec.in
@@ -115,5 +115,5 @@ test -d build || mkdir build
 # /opt/rtems/lib/libiberty*
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-gdb
+/opt/rtems/bin/@target_alias@-gdb@exe_ext@
 
diff --git a/scripts/gnatnewlib/gnatnewlib.spec.in b/scripts/gnatnewlib/gnatnewlib.spec.in
index 7b91a4722b..1758f559ac 100644
--- a/scripts/gnatnewlib/gnatnewlib.spec.in
+++ b/scripts/gnatnewlib/gnatnewlib.spec.in
@@ -165,13 +165,13 @@ This is the gcc/objc compiler for @target_alias@
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
 %dir /opt/rtems/bin
-/opt/rtems/bin/cpp
-/opt/rtems/bin/gcov
-/opt/rtems/bin/@target_alias@-c++
-/opt/rtems/bin/@target_alias@-g++
-/opt/rtems/bin/@target_alias@-gcc
-/opt/rtems/bin/@target_alias@-protoize
-/opt/rtems/bin/@target_alias@-unprotoize
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+/opt/rtems/bin/@target_alias@-c++@exe_ext@
+/opt/rtems/bin/@target_alias@-g++@exe_ext@
+/opt/rtems/bin/@target_alias@-gcc@exe_ext@
+/opt/rtems/bin/@target_alias@-protoize@exe_ext@
+/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
@@ -202,7 +202,7 @@ This is the gcc/objc compiler for @target_alias@
 
 %files -n @target_alias@-chill -f build/files.chill
 %dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-chill
+/opt/rtems/bin/@target_alias@-chill@exe_ext@
 
 %dir /opt/rtems/info
 %doc /opt/rtems/info/dir
@@ -231,18 +231,18 @@ This is the gcc/objc compiler for @target_alias@
 
 %files -n @target_alias@-gcj -f build/files.gcj
 %dir /opt/rtems/bin
-/opt/rtems/bin/jcf-dump
-/opt/rtems/bin/jv-scan
-/opt/rtems/bin/gcjh
-/opt/rtems/bin/@target_alias@-gcj
+/opt/rtems/bin/jcf-dump@exe_ext@
+/opt/rtems/bin/jv-scan@exe_ext@
+/opt/rtems/bin/gcjh@exe_ext@
+/opt/rtems/bin/@target_alias@-gcj@exe_ext@
 
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@
 
 
 %files -n @target_alias@-g77 -f build/files.g77
 %dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-g77
+/opt/rtems/bin/@target_alias@-g77@exe_ext@
 
 %dir /opt/rtems/info
 %doc /opt/rtems/info/g77.info*
@@ -251,7 +251,7 @@ This is the gcc/objc compiler for @target_alias@
 %dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-g77.1
 
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
 
 %post -n @target_alias@-g77
   if test -d $RPM_INSTALL_PREFIX/rtems/info; 
@@ -275,5 +275,5 @@ This is the gcc/objc compiler for @target_alias@
 
 
 %files -n @target_alias@-objc -f build/files.objc
-/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
diff --git a/scripts/mkbinutilspec.in b/scripts/mkbinutilspec.in
index 1ee614e6a6..c758992dbb 100644
--- a/scripts/mkbinutilspec.in
+++ b/scripts/mkbinutilspec.in
@@ -7,6 +7,7 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
 
 CFG=setup.cache
 dst=@RPM_SPECSdir@
+exe_ext=@EXEEXT@
 
 usage()
 {
@@ -54,6 +55,7 @@ sed -e "s%@Release@%${binutils_rpm_release}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
     -e "s%@binutils_version@%${binutils_version}%g" \
     -e "s%@binutils_patch_version@%${binutils_patch_version}%g" \
+    -e "s%@ext_ext@%${ext_ext}%g" \
 < ${RTEMS_DIR}/binutils/binutils.spec.in \
 > ${specfile}
 
diff --git a/scripts/mkbspspec.in b/scripts/mkbspspec.in
index 401c405f03..9d0470539d 100644
--- a/scripts/mkbspspec.in
+++ b/scripts/mkbspspec.in
@@ -6,6 +6,7 @@ RTEMS_VERSION=@RTEMS_VERSION@
 
 CFG=setup.cache
 dst=@RPM_SPECSdir@
+exe_ext=@EXEEXT@
 
 usage()
 {
@@ -54,6 +55,7 @@ sed -e "s%@Release@%${rtems_rpm_release}%g" \
     -e "s%@rtems_version@%${rtems_version}%g" \
     -e "s%@rpm_build_root@%${rpm_build_root}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
+    -e "s%@ext_ext@%${ext_ext}%g" \
 < ${RTEMS_DIR}/rtems/rtems.spec.in \
 > ${specfile}
 
diff --git a/scripts/mkgccnewlibspec.in b/scripts/mkgccnewlibspec.in
index 248aa2828e..7fbac44246 100644
--- a/scripts/mkgccnewlibspec.in
+++ b/scripts/mkgccnewlibspec.in
@@ -7,6 +7,7 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
 
 CFG=setup.cache
 dst=@RPM_SPECSdir@
+exe_ext=@EXEEXT@
 
 usage()
 {
@@ -63,6 +64,7 @@ sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \
     -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
     -e "s%@newlib_version@%${newlib_version}%g" \
     -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
+    -e "s%@ext_ext@%${ext_ext}%g" \
 < ${specsrc} \
 > ${specfile}
 
diff --git a/scripts/mkgdbspec.in b/scripts/mkgdbspec.in
index 89baee7d52..24b95f27f6 100644
--- a/scripts/mkgdbspec.in
+++ b/scripts/mkgdbspec.in
@@ -7,6 +7,7 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
 
 CFG=setup.cache
 dst=@RPM_SPECSdir@
+exe_ext=@EXEEXT@
 
 usage()
 {
@@ -69,16 +70,17 @@ sed -e "s%@Release@%${gdb_rpm_release}%g" \
     -e "s%@gdb_version@%${gdb_version}%g" \
     -e "s%@gdb_patch_version@%${gdb_patch_version}%g" \
     -e "s%@extra_configure_arguments@%${extra_configure_arguments}%g" \
+    -e "s%@ext_ext@%${ext_ext}%g" \
 < ${RTEMS_DIR}/gdb/gdb.spec.in \
 > ${specfile}
 
 case ${target_alias} in
   powerpc*)
-     echo "/opt/rtems/bin/${target_alias}-run" 
+     echo "/opt/rtems/bin/${target_alias}-run${exe_ext}" 
      ;;
   sparc*)
-     echo "/opt/rtems/bin/${target_alias}-run" 
-     echo "/opt/rtems/bin/${target_alias}-sis" 
+     echo "/opt/rtems/bin/${target_alias}-run${exe_ext}" 
+     echo "/opt/rtems/bin/${target_alias}-sis${exe_ext}" 
      ;;
   *) ;;
 esac >> ${specfile}
diff --git a/scripts/mkgnatnewlibspec.in b/scripts/mkgnatnewlibspec.in
index c27279c368..5eb4231617 100644
--- a/scripts/mkgnatnewlibspec.in
+++ b/scripts/mkgnatnewlibspec.in
@@ -7,6 +7,7 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
 
 CFG=setup.cache
 dst=@RPM_SPECSdir@
+exe_ext=@EXEEXT@
 
 usage()
 {
@@ -56,6 +57,7 @@ sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \
     -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
     -e "s%@newlib_version@%${newlib_version}%g" \
     -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
+    -e "s%@ext_ext@%${ext_ext}%g" \
 < ${RTEMS_DIR}/gccnewlib/gccnewlib.spec.in \
 > ${specfile}