set default EPICS_BASE to 3.14.10 --> 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 23:14:29.916781378 +0100
+++ new-branch-2-0/Makefile 2022-11-28 23:14:29.916781378 +0100
@@ -10,11 +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 wwwcsr@www-csr.bessy.de:www/control/SoftDist/sequencer/branch-2-0-13
- darcs dist -d seq-2.0.13-rc1
- rsync seq-2.0.13-rc1.tar.gz wwwcsr@www-csr.bessy.de:www/control/SoftDist/sequencer/releases/
+ 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 23:14:29.916781378 +0100
+++ new-branch-2-0/configure/CONFIG 2022-11-28 23:14:29.916781378 +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 23:14:29.916781378 +0100
+++ new-branch-2-0/configure/RELEASE 2022-11-28 23:14:29.916781378 +0100
@@ -3,4 +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=/opt/Epics/R3.14.8/base/3-14-8-2-0
+EPICS_BASE=/opt/Epics/R3.14.10/base/3-14-10-0-1
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 23:14:29.916781378 +0100
+++ new-branch-2-0/src/snc/parse.c 2022-11-28 23:14:29.920781476 +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/snc_lex.l new-branch-2-0/src/snc/snc_lex.l
--- old-branch-2-0/src/snc/snc_lex.l 2022-11-28 23:14:29.916781378 +0100
+++ new-branch-2-0/src/snc/snc_lex.l 2022-11-28 23:14:29.920781476 +0100
@@ -40,7 +40,7 @@
#include <string.h>
#include <stdlib.h>
-#include <unistd.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 23:14:29.916781378 +0100
+++ new-branch-2-0/test/validate/Makefile 2022-11-28 23:14:29.920781476 +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.1