Skip to content
Permalink
Browse files

Feature: Add Fedora Core 28 support

This will provide support for fc28 builds. Fc28 uses version 8.1
gcc compilers which added several new compiler warnings which
required changes to many of the modules. Some use pragma's to
ignore the warnings but since many of the new warnings were not
recognized in older versions of the compile the pragma's needed
to be invoked inside compiler version checks.
  • Loading branch information...
tfredian committed Jun 6, 2018
1 parent 44ce1d6 commit 45d097c224f89519daf3eab4f55fba43fab20312
Showing with 696 additions and 509 deletions.
  1. +10 −0 camshr/map_scsi_device.c
  2. +5 −0 camshr/parse_cts_db.c
  3. +1 −0 deploy/os/fc28.opts
  4. +13 −15 deploy/packaging/windows/create_installer.sh
  5. +4 −0 dwscope/RemoteDummies.c
  6. +4 −1 dwscope/dwscope.c
  7. +5 −0 dwscope/dwscopesubs.c
  8. +5 −0 dwscope/evaluate.c
  9. +5 −0 idlmdsevent/mdsevent.c
  10. +4 −0 idlmdswidgets/cw_wveditv5.c
  11. +3 −1 javamds/JavaData.c
  12. +3 −0 javamds/javamds.c
  13. +2 −1 javamds/mdsobjects.c
  14. +1 −1 math/caxpy.f
  15. +83 −83 math/cgeco.f
  16. +5 −5 math/daxpy.f
  17. +65 −65 math/dgeco.f
  18. +4 −4 math/saxpy.f
  19. +65 −65 math/sgeco.f
  20. +5 −5 math/zaxpy.f
  21. +83 −83 math/zgeco.f
  22. +145 −115 mdsdcl/cmdParseLex.c
  23. +30 −29 mdsdcl/dcllex.h
  24. +11 −5 mdslibidl/MdsLibIdl.c
  25. +7 −5 mdsshr/MdsEvents.c
  26. +1 −6 mdssql/dynamic_syb.c
  27. +4 −0 mdstcpip/udt4/src/api.cpp
  28. +8 −6 mitdevices/a3204.c
  29. +8 −6 mitdevices/l8100.c
  30. +3 −0 mitdevices/mpb__decoder.c
  31. +4 −0 tdishr/TdiCall.c
  32. +3 −2 tdishr/TdiConstant.c
  33. +4 −0 tdishr/TdiConvert.c
  34. +3 −0 tdishr/TdiEvaluate.c
  35. +3 −0 traverser/CallbacksUil.c
  36. +5 −0 treeshr/TreeAddNode.c
  37. +5 −0 treeshr/TreeGetDbi.c
  38. +5 −0 treeshr/TreeGetNci.c
  39. +5 −0 treeshr/TreeGetRecord.c
  40. +22 −0 treeshr/TreeOpen.c
  41. +5 −0 treeshr/TreePutRecord.c
  42. +10 −0 treeshr/TreeSetNci.c
  43. +4 −0 xmdsshr/XmdsComplain.c
  44. +1 −1 xmdsshr/XmdsDigChans.c
  45. +4 −0 xmdsshr/XmdsExpr.c
  46. +4 −0 xmdsshr/XmdsInitialize.c
  47. +3 −0 xmdsshr/XmdsNidOptionMenu.c
  48. +4 −0 xmdsshr/XmdsOkButtons.c
  49. +6 −1 xmdsshr/XmdsWaveform.c
  50. +4 −4 xmdsshr/XmdsXdBoxDialog.c
@@ -134,10 +134,20 @@ int map_scsi_device(char *highway_name)
// update memory mapped version
if (found) {
sprintf(dsf, "%03d", sg_number); // format conversion
#pragma GCC diagnostic push
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif
strncpy((CRATEdb + i)->DSFname, dsf, 3); // real device number
#pragma GCC diagnostic pop
(CRATEdb + i)->HwyType = hwytype; // highway type
} else {
#pragma GCC diagnostic push
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif
strncpy((CRATEdb + i)->DSFname, "...", 3); // place-holder device number
#pragma GCC diagnostic pop
(CRATEdb + i)->HwyType = '.';
}

@@ -95,5 +95,10 @@ void parse_cts_db(struct MODULE *in, struct Module_ *out)
break;
}
comm[i + 1] = '\0'; // 'early' termination
#pragma GCC diagnostic push
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif
strncpy(out->comment, comm, i); // 'copy' it over [2002.02.07]
#pragma GCC diagnostic pop
}
@@ -0,0 +1 @@
--platform=redhat --valgrind=memcheck,helgrind --sanitize=address,undefined,thread --dockerimage=mdsplus/docker:fc28 --distname=fc28
@@ -39,20 +39,18 @@ makensis -DMAJOR=${major} -DMINOR=${minor} -DRELEASE=${release} -DFLAVOR=${bname
popd
if [ -d /sign_keys ]
then
for timestamp_server in http://timestamp.comodoca.com/authenticode http://timestamp.verisign.com/scripts/timestamp.dll http://timestamp.globalsign.com/scripts/timestamp.dll http://tsa.starfieldtech.com
do
if ( signcode -spc /sign_keys/mdsplus.spc \
-v /sign_keys/mdsplus.pvk \
-a sha1 \
-$ individual \
-n MDSplus \
-i http://www.mdsplus.org/ \
-t http://timestamp.verisign.com/scripts/timestamp.dll \
-tr 10 /release/${BRANCH}/MDSplus${bname}-${major}.${minor}-${release}.exe <<EOF
mdsplus
EOF
)
then break
echo "Signing installer"
if ( osslsigncode sign -certs /sign_keys/mdsplus.spc \
-key /sign_keys/mdsplus.pvk -pass mdsplus \
-n "MDSplus" -i http://www.mdsplus.org/ \
-in /release/${BRANCH}/MDSplus${bname}-${major}.${minor}-${release}.exe \
-out /release/${BRANCH}/MDSplus${bname}-${major}.${minor}-${release}-signed.exe
)
then
mv -v /release/${BRANCH}/MDSplus${bname}-${major}.${minor}-${release}-signed.exe \
/release/${BRANCH}/MDSplus${bname}-${major}.${minor}-${release}.exe
echo "Installer successfully signed"
else
echo "Failed to sign installer"
fi
done
fi
@@ -26,6 +26,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <Mrm/MrmPublic.h>
#include <Xm/Xm.h>
#include <Xmds/XmdsWaveform.h>
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wcast-function-type\"")
#endif

void XmdsInitialize()
{
xmdsWaveformWidgetClass = (WidgetClass) & xmdsWaveformClassRec;
@@ -83,6 +83,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <DXm/DECspecific.h>
#endif

#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wcast-function-type\"")
#endif
pthread_mutex_t event_mutex;

extern void XmdsInitialize();
@@ -1190,7 +1193,7 @@ static void /*XtCallbackProc */ ApplyCustomizeWindow(Widget w __attribute__ ((un
XtVaGetValues(PlotsWidget, XmNnumChildren, &num, XmNchildren, &widgets, NULL);
XtUnmanageChildren(widgets, num);
Columns = 1;
memcpy(old_rows, Rows, sizeof(old_rows));
memcpy(old_rows, Rows, sizeof(Rows));
for (c = 0; c < MaxCols; c++) {
char name[8];
sprintf(name, "rows_%d", c + 1);
@@ -94,6 +94,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "dwscope.h"
#include <mdsplus/mdsplus.h>

#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wcast-function-type\"")
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif

extern int XmdsManageWindow();
Boolean ConvertSelectionToWave(Widget w, Atom result_type, unsigned long length, CutHeader * header,
WaveInfo * info);
@@ -654,7 +654,12 @@ static long ConnectToMdsEvents(char *event_host)
sscanf(event_host, "%[^:]:%s", hostpart, portpart);
if (strlen(portpart) == 0)
strcpy(portpart, "mdsipe");
#pragma GCC diagnostic push
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wformat-truncation\"")
#endif
snprintf(host, 99, "%s:%s", hostpart, portpart);
#pragma GCC diagnostic pop
return ConnectToMds(host);
}

@@ -242,7 +242,12 @@ EXPORT int IDLMdsEvent(int argc, void * *argv)
e->stub_id = *stub_id;
e->base_id = *base_id;
e->loc_event_id = EventCount++;
#pragma GCC diagnostic push
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif
strncpy(e->name, name, sizeof(e->name));
#pragma GCC diagnostic pop
e->next = EventList;
EventList = e;
if (sock != INVALID_SOCKET) {
@@ -43,6 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
#include "export.h"

#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wcast-function-type\"")
#endif

enum callback_id { CB_UNKNOWN, CB_AUTOSCALE, CB_CROSSHAIRS, CB_LIMITS, CB_MOVE, CB_STRETCH,
CB_SET_AT_LIMITS, CB_ADD_POINT,
CB_DELETE_POINT, CB_PASTE, CB_FIT, CB_USER
@@ -726,6 +726,7 @@ EXPORT struct descriptor *ObjectToDescrip(JNIEnv * env, jobject obj)
return desc;
default:
printf("\nUnsupported type for CLASS_S: %d\n", dtype);
return NULL;
}
break;
case CLASS_A:
@@ -846,6 +847,7 @@ EXPORT struct descriptor *ObjectToDescrip(JNIEnv * env, jobject obj)
return (struct descriptor *)array_d;
default:
printf("\nUnsupported type for CLASS_A: %d\n", dtype);
return NULL;
break;
}
case CLASS_R:
@@ -893,7 +895,7 @@ EXPORT struct descriptor *ObjectToDescrip(JNIEnv * env, jobject obj)
default:
printf("\nUnsupported class: %d\n", dclass);
}
return 0;
return NULL;
}

EXPORT void FreeDescrip(struct descriptor *desc)
@@ -36,6 +36,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "MdsHelper.h"
#include "jScope_MdsIpProtocolWrapper.h"
#include "../mdstcpip/mdsip_connections.h"
#if defined __GNUC__ && 800 <= __GNUC__ * 100 + __GNUC_MINOR__
_Pragma ("GCC diagnostic ignored \"-Wstringop-truncation\"")
#endif

extern int TdiCompile(), TdiData(), TdiFloat();

@@ -922,6 +922,7 @@ static struct descriptor *ObjectToDescrip(JNIEnv * env, jobject obj)
return completeDescr(desc, helpDscPtr, unitsDscPtr, errorDscPtr, validationDscPtr);
default:
printf("\nUnsupported type for CLASS_S: %d\n", dtype);
return NULL;
}
break;
case CLASS_A:
@@ -1057,7 +1058,7 @@ static struct descriptor *ObjectToDescrip(JNIEnv * env, jobject obj)
validationDscPtr);
default:
printf("\nUnsupported type for CLASS_A: %d\n", dtype);
break;
return NULL;
}
case CLASS_R:

@@ -32,7 +32,7 @@
Integer Function ICAMAX(n,x,incx)
Integer i,incx,j,n
REAL xmax
COMPLEX x(1)
COMPLEX x(n*incx)
If (n.le.0) Then
ICAMAX=0
ElseIf (n.eq.1) Then
Oops, something went wrong.

0 comments on commit 45d097c

Please sign in to comment.
You can’t perform that action at this time.