fixed bug introduced in compiler ansification patch --> to head
Warning, cannot access the index:
_darcs/index: opening of '_darcs/index' failed: permission denied (Permission denied)
diff -rN -u old-branch-2-0/Makefile new-branch-2-0/Makefile
--- old-branch-2-0/Makefile 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/Makefile 2022-11-28 22:58:35.769178106 +0100
@@ -10,4 +10,16 @@
DIRS += test
test_DEPEND_DIRS = src
+DEFAULT_REPO = /opt/repositories/controls/darcs/epics/support/seq/branch-2-0-13
+SEQ_PATH = www/control/SoftDist/sequencer
+USER_AT_HOST = wwwcsr@www-csr.bessy.de
+
include $(TOP)/configure/RULES_TOP
+
+upload:
+ darcs push $(DEFAULT_REPO)
+ darcs push --repo=$(DEFAULT_REPO) -a $(USER_AT_HOST):$(SEQ_PATH)/branch-2-0-13
+ darcs dist -d seq-$(SEQ_VERSION)
+ rsync seq-$(SEQ_VERSION).tar.gz $(USER_AT_HOST):$(SEQ_PATH)/releases/
+
+.PHONY: upload
diff -rN -u old-branch-2-0/configure/CONFIG new-branch-2-0/configure/CONFIG
--- old-branch-2-0/configure/CONFIG 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/configure/CONFIG 2022-11-28 22:58:35.773178206 +0100
@@ -25,4 +25,4 @@
-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
endif
-SEQ_VERSION = 2.0.12
+SEQ_VERSION = 2.0.14
diff -rN -u old-branch-2-0/configure/RELEASE new-branch-2-0/configure/RELEASE
--- old-branch-2-0/configure/RELEASE 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/configure/RELEASE 2022-11-28 22:58:35.773178206 +0100
@@ -3,6 +3,4 @@
# You should do a "gnumake clean uninstall install" in the application
# top directory each time changes are made to this file
-#EPICS_BASE=/usr/local/iocapps/R3.14.8.2/base/3-14-8-2-asd1
-
-EPICS_BASE=/home/phoebus/ANJ/epics/base/3-14-dev
+EPICS_BASE=/opt/Epics/R3.14.10/base/3-14-10-0-1
diff -rN -u old-branch-2-0/src/dev/devSequencer.c new-branch-2-0/src/dev/devSequencer.c
--- old-branch-2-0/src/dev/devSequencer.c 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/dev/devSequencer.c 2022-11-28 22:58:35.773178206 +0100
@@ -188,15 +188,15 @@
and replace null characeter to point end of string.
And assign to sperated strings */
while(argN<3) {
- if(*(inpStr+i) == NULL) break;
+ if(*(inpStr+i) == 0) break;
inpArg[argN++] = inpStr+i;
while(i<80) {
tempChar = inpStr + (i++);
if((*tempChar < '0' || *tempChar > '9') &&
(*tempChar < 'a' || *tempChar > 'z') &&
(*tempChar < 'A' || *tempChar > 'Z') ) {
- if(*tempChar == NULL) i-=1;
- *tempChar = NULL;
+ if(*tempChar == 0) i-=1;
+ *tempChar = 0;
break;
}
}
diff -rN -u old-branch-2-0/src/seq/seqCom.h new-branch-2-0/src/seq/seqCom.h
--- old-branch-2-0/src/seq/seqCom.h 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/seq/seqCom.h 2022-11-28 22:58:35.773178206 +0100
@@ -67,7 +67,7 @@
#define OPT_DOEXITTOSELF (1<<2) /* Do exit{} even if to same state */
/* Macros to handle set & clear event bits */
-typedef unsigned long bitMask;
+typedef epicsUInt32 bitMask;
#define NBITS (8*sizeof(bitMask))
/* # bits in bitMask word */
diff -rN -u old-branch-2-0/src/seq/seq_qry.c new-branch-2-0/src/seq/seq_qry.c
--- old-branch-2-0/src/seq/seq_qry.c 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/seq/seq_qry.c 2022-11-28 22:58:35.773178206 +0100
@@ -476,7 +476,7 @@
pSP = seqFindProg(tid);
if (pSP == NULL)
{
- printf("No state program exists for thread id %ld\n", (long)tid);
+ printf("No state program exists for thread id %p\n", tid);
return NULL;
}
diff -rN -u old-branch-2-0/src/snc/gen_ss_code.c new-branch-2-0/src/snc/gen_ss_code.c
--- old-branch-2-0/src/snc/gen_ss_code.c 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/snc/gen_ss_code.c 2022-11-28 22:58:35.773178206 +0100
@@ -299,7 +299,7 @@
/* local declarations are handled as text */
if (tp->type == E_TEXT)
{
- printf("\t\t%s\n", tp->left);
+ printf("\t\t%s\n", (char *)tp->left);
}
else if (tp->type == E_WHEN)
@@ -566,7 +566,7 @@
printf("]");
break;
case E_TEXT:
- printf("%s\n", ep->left);
+ printf("%s\n", (char *)ep->left);
line_num += 1;
break;
default:
diff -rN -u old-branch-2-0/src/snc/parse.c new-branch-2-0/src/snc/parse.c
--- old-branch-2-0/src/snc/parse.c 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/snc/parse.c 2022-11-28 22:58:35.773178206 +0100
@@ -194,22 +194,25 @@
return;
}
-int check_type_too_long(Var *vp)
+void check_type_too_long(Var *vp)
{
extern int line_num;
+ extern char *src_file;
- if ((sizeof(long) > 4 && (vp->type == V_LONG || vp->type == V_ULONG))
- || (sizeof(int) > 4 && (vp->type == V_INT || vp->type == V_UINT)))
+ if (vp->type == V_LONG || vp->type == V_ULONG)
{
- fprintf(stderr,
- "line %d: cannot assign variable >%s< because on this architecture "
- "its (base) type is larger than 4 bytes. Such variables cannot be faithfully "
- "mapped to any of the Channel Access base types.\nTry declaring the "
- "variable as 'int' or, if that is still too large on your system, as 'short'.\n",
- line_num, vp->name);
- return FALSE;
+ printf("#include <limits.h>\n");
+ print_line_num(line_num-1, src_file);
+ printf(
+"#if LONG_MAX > 0x7fffffffL\n"
+"# error "
+"cannot assign variable >%s< because on this architecture its (base) \\\n"
+"type is larger than 4 bytes. Such variables cannot be faithfully mapped \\\n"
+"to any of the Channel Access base types. Try declaring the variable \\\n"
+"as 'int' or 'unsigned int'.\n"
+"#endif\n",
+ vp->name);
}
- return TRUE;
}
/* "Assign" statement: Assign a variable to a DB channel.
@@ -245,7 +248,7 @@
return;
}
- if (!check_type_too_long(vp)) return;
+ check_type_too_long(vp);
/* Build structure for this channel */
cp = build_db_struct(vp);
@@ -290,7 +293,7 @@
return;
}
- if (!check_type_too_long(vp)) return;
+ check_type_too_long(vp);
cp = vp->chan;
if (cp == NULL)
@@ -374,7 +377,7 @@
return;
}
- if (!check_type_too_long(vp)) return;
+ check_type_too_long(vp);
/* Build a db structure for this variable */
cp = build_db_struct(vp);
diff -rN -u old-branch-2-0/src/snc/phase2.c new-branch-2-0/src/snc/phase2.c
--- old-branch-2-0/src/snc/phase2.c 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/snc/phase2.c 2022-11-28 22:58:35.773178206 +0100
@@ -429,7 +429,7 @@
for (; ep != NULL; ep = ep->next)
{
print_line_num(ep->line_num, ep->src_file);
- printf("%s\n", ep->left);
+ printf("%s\n", (char *)ep->left);
}
}
return;
@@ -447,7 +447,7 @@
print_line_num(ep->line_num, ep->src_file);
for (; ep != NULL; ep = ep->next)
{
- printf("%s\n", ep->left);
+ printf("%s\n", (char *)ep->left);
}
}
return;
diff -rN -u old-branch-2-0/src/snc/snc.y new-branch-2-0/src/snc/snc.y
--- old-branch-2-0/src/snc/snc.y 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/snc/snc.y 2022-11-28 22:58:35.773178206 +0100
@@ -454,9 +454,10 @@
;
pp_code /* pre-processor code (e.g. # 1 "test.st") */
-: PP_SYMBOL NUMBER STRING CR { pp_code($2, $3); }
-| PP_SYMBOL NUMBER CR { pp_code($2, 0); }
-| PP_SYMBOL STRING CR { /* Silently consume #pragma lines */ }
+: PP_SYMBOL NUMBER STRING CR { pp_code($2, $3); }
+| PP_SYMBOL NUMBER CR { pp_code($2, 0); }
+| PP_SYMBOL NUMBER STRING NUMBER CR { pp_code($2, $3); }
+| PP_SYMBOL STRING CR { /* Silently consume #pragma lines */ }
;
pp_codes /* one or more pp_code */
diff -rN -u old-branch-2-0/src/snc/snc_lex.l new-branch-2-0/src/snc/snc_lex.l
--- old-branch-2-0/src/snc/snc_lex.l 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/src/snc/snc_lex.l 2022-11-28 22:58:35.773178206 +0100
@@ -39,7 +39,8 @@
*/
#include <string.h>
-#include <unistd.h>
+#include <stdlib.h>
+#include <osiUnistd.h>
#ifndef TRUE
#define TRUE 1
diff -rN -u old-branch-2-0/test/validate/Makefile new-branch-2-0/test/validate/Makefile
--- old-branch-2-0/test/validate/Makefile 2022-11-28 22:58:35.769178106 +0100
+++ new-branch-2-0/test/validate/Makefile 2022-11-28 22:58:35.773178206 +0100
@@ -18,7 +18,9 @@
PROD += sncExitOptx
PROD += sncOptt
PROD += sncOpttVar
-PROD += tooLong
+
+# this test is supposed to fail on 64 bit systems
+#PROD += tooLong
# Libraries
PROD_LIBS += seq
patch e68b6837c43f019bf88c8cd217899e149f1befe3
Author: benjamin.franksen@helmholtz-berlin.de
Date: Mon May 16 11:36:07 CEST 2011
tagged seq-2-0-14
patch 8c3741b8f21ca90bf16d97021141af499417cce8
Author: benjamin.franksen@helmholtz-berlin.de
Date: Mon May 16 11:03:05 CEST 2011
* bumped version to 2.0.14
patch 2865e645db1e92809f7ddd0edf3790249c168ad6
Author: benjamin.franksen@helmholtz-berlin.de
Date: Mon May 16 11:02:28 CEST 2011
* parameterized upload target in top-level Makefile
patch 0cb1806fb856ed2f0f77dfd2c4217c16b571e401
Author: ben.franksen@online.de
Date: Tue May 10 02:27:46 CEST 2011
* fix windows build by using osiUnistd.h instead of unistd.h
patch d13523b6784c164749524c5823ebcc96a74c72a7
Author: benjamin.franksen@helmholtz-berlin.de
Date: Sat May 7 14:03:38 CEST 2011
tagged seq-2-0-13
patch 84759dfd183e3d1ca02322e1a5f6bbdccec676fc
Author: benjamin.franksen@helmholtz-berlin.de
Date: Sat May 7 14:00:31 CEST 2011
* SEQ_VERSION is now 2.0.13
patch 8d3d21f52de362483db54ce80b82be59136c3b3e
Author: benjamin.franksen@helmholtz-berlin.de
Date: Sat May 7 13:57:39 CEST 2011
* updated upload target for final release
patch 740da846872c483a7d7ca6d595b90cdf09ddfcd7
Author: ben.franksen@online.de
Date: Sat May 7 13:48:38 CEST 2011
* comment out tooLong test
patch 18952d1cf5840732202ca9ed695eabb318613c84
Author: benjamin.franksen@helmholtz-berlin.de
Date: Tue Apr 19 12:59:21 CEST 2011
tagged seq-2-0-13-rc2
patch da751ed92d645c51728e9d112b83711bf9a5a7e5
Author: benjamin.franksen@helmholtz-berlin.de
Date: Tue Apr 19 12:37:40 CEST 2011
* move error detection for assign to 64 bit long from snc to C compiler
patch d447a6131777c49691b19f42062b175aa8acadb8
Author: benjamin.franksen@helmholtz-berlin.de
Date: Fri Apr 15 12:28:50 CEST 2011
tagged seq-2-0-13-rc1
patch 5a8ae3860d93b9dca68721c105a46fa74dba80c9
Author: benjamin.franksen@helmholtz-berlin.de
Date: Fri Apr 15 12:14:10 CEST 2011
* set default EPICS_BASE to 3.14.10
patch 298a5019abba1f4e7b923d893d89cca4ba03f2b0
Author: benjamin.franksen@helmholtz-berlin.de
Date: Fri Apr 15 11:58:11 CEST 2011
* added upload target to top-level Makefile
patch 484cbaafc6c3f26e6766190e9f0215d5d02dcb43
Author: ben.franksen@online.de
Date: Fri Apr 15 00:24:24 CEST 2011
* changed bitMask from unsigned long to epicsUInt32
Bitmasks are written out as literals by the compiler, so must
be of a fixed size (else the target systems bitMask overflows).
patch 90791322f0148b0bc6872f1e97c0f8780ae53ee3
Author: ben.franksen@online.de
Date: Thu Apr 7 13:24:29 CEST 2011
* fix a few warnings
patch 1fd8a8ed4b300ee2e93e4790a25c8a031553b94b
Author: ben.franksen@online.de
Date: Thu Apr 7 13:23:23 CEST 2011
* set default EPICS_BASE to 3.14.8.2
patch 6320ac0ec8ab38e8acd9f3888d3c312296e2746a
Author: benjamin.franksen@helmholtz-berlin.de
Date: Thu Apr 7 13:22:16 CEST 2011
* fixed bug introduced in compiler ansification patc