Skip to content

Commit 27e68e4

Browse files
author
Nicholas Reed
committed
Update version strings in fedex, fedex_plus, generated code, and documentation. SCL git 6851b27, fa615a1, dc30ee2, d190a1e, a33cba8, 698b9e0.
1 parent 11891b7 commit 27e68e4

10 files changed

Lines changed: 40 additions & 32 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ if(NOT SCL_IS_SUBBUILD)
314314
# $make package #
315315
###############################################################################
316316

317-
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEP Class Library")
317+
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
318318
SET(CPACK_SET_DESTDIR "ON")
319319

320320
SET(CPACK_PACKAGE_VERSION_MAJOR ${SCL_VERSION_MAJOR})

‎SCL_VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5
1+
0.6

‎doc/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ PROJECT_NUMBER = 3.2
3737
# for a project that appears at the top of each page and should give viewer
3838
# a quick idea about the purpose of the project. Keep the description short.
3939

40-
PROJECT_BRIEF = "STEP Class Library"
40+
PROJECT_BRIEF = "STEPcode"
4141

4242
# With the PROJECT_LOGO tag one can specify an logo or icon that is
4343
# included in the documentation. The maximum height of the logo should not

‎doc/doxyassist.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<qtHelp collectionFile="./doc/helpcollection.qhc"
6969
projectFile="./doc/helpcollection.qhcp"
7070
storage="./doc/qch" copyAction="copy">
71-
<title>StepClassLibrary</title>
71+
<title>STEPcode</title>
7272
<startPage>qthelp://com.github.mpictor/doc/index.html</startPage>
7373
<!-- See http://doc.trolltech.com/assistant-custom-help-viewer.html for more
7474
settings in the <assistant> section. -->
@@ -100,7 +100,7 @@
100100
-->
101101
<project>
102102
<!-- The name of the project -->
103-
<name>StepClassLibrary</name>
103+
<name>STEPcode</name>
104104
<!-- The version number of the documentation -->
105105
<version>0.2</version>
106106
<!-- Whether to build version specific documentation for the projects or not.
@@ -250,4 +250,4 @@
250250
</project>
251251
<!-- And you can even add more top level projects to collect. -->
252252
</projects>
253-
</DoxyAssist>
253+
</DoxyAssist>

‎doc/doxygen_custom_header.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
<!-- add module list -->
4848
<div id="navrow0" class="tabs">
4949
<ul class="tablist">
50-
<li><a href="../../doc.StepClassLibrary/doxygen-html/index.html"><span>Main</span></a></li>
51-
<li><a href="../../doc.StepClassLibrary.CLDAI/doxygen-html/index.html"><span>CLDAI</span></a></li>
52-
<li><a href="../../doc.StepClassLibrary.CLEditor/doxygen-html/index.html"><span>CLEditor</span></a></li>
53-
<li><a href="../../doc.StepClassLibrary.CLProbe-ui/doxygen-html/index.html"><span>CLProbe-ui</span></a></li>
54-
<li><a href="../../doc.StepClassLibrary.CLStepCore/doxygen-html/index.html"><span>CLStepCore</span></a></li>
55-
<li><a href="../../doc.StepClassLibrary.CLUtils/doxygen-html/index.html"><span>CLUtils</span></a></li>
56-
<li><a href="../../doc.StepClassLibrary.ExPPP/doxygen-html/index.html"><span>ExPPP</span></a></li>
57-
<li><a href="../../doc.StepClassLibrary.Express/doxygen-html/index.html"><span>Express</span></a></li>
58-
<li><a href="../../doc.StepClassLibrary.Fedex-Plus/doxygen-html/index.html"><span>Fedex-Plus</span></a></li>
59-
<li><a href="../../doc.StepClassLibrary.Tests/doxygen-html/index.html"><span>Tests</span></a></li>
50+
<li><a href="../../doc.STEPcode/doxygen-html/index.html"><span>Main</span></a></li>
51+
<li><a href="../../doc.STEPcode.CLDAI/doxygen-html/index.html"><span>CLDAI</span></a></li>
52+
<li><a href="../../doc.STEPcode.CLEditor/doxygen-html/index.html"><span>CLEditor</span></a></li>
53+
<li><a href="../../doc.STEPcode.CLProbe-ui/doxygen-html/index.html"><span>CLProbe-ui</span></a></li>
54+
<li><a href="../../doc.STEPcode.CLStepCore/doxygen-html/index.html"><span>CLStepCore</span></a></li>
55+
<li><a href="../../doc.STEPcode.CLUtils/doxygen-html/index.html"><span>CLUtils</span></a></li>
56+
<li><a href="../../doc.STEPcode.ExPPP/doxygen-html/index.html"><span>ExPPP</span></a></li>
57+
<li><a href="../../doc.STEPcode.Express/doxygen-html/index.html"><span>Express</span></a></li>
58+
<li><a href="../../doc.STEPcode.Fedex-Plus/doxygen-html/index.html"><span>Fedex-Plus</span></a></li>
59+
<li><a href="../../doc.STEPcode.Tests/doxygen-html/index.html"><span>Tests</span></a></li>
6060
</ul>
6161
</div>
6262
<!-- end module list -->

‎src/clstepcore/sdai.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <sdai.h>
55
#include "scl_memmgr.h"
66

7-
const char * SCLversion = "STEP Class Library version 3.1";
7+
const char * SCLversion = "STEPcode, github.com/stepcode/stepcode";
88

99
const SDAI_Integer SDAI_INT_NULL = LONG_MAX;
1010
const SDAI_Real SDAI_REAL_NULL = FLT_MIN;

‎src/express/fedex.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,10 @@
7171
*
7272
*/
7373

74-
char * FEDEXversion( void ) {
75-
return( "V2.11.4-beta CADDETC preval June 8, 1995" );
76-
}
77-
7874
#include <scl_cf.h>
7975
#include <scl_memmgr.h>
8076
#include <scl_export.h>
77+
#include "scl_version_string.h"
8178
#include <stdlib.h>
8279
#include <stdio.h>
8380
#ifdef HAVE_UNISTD_H
@@ -99,10 +96,17 @@ extern int exp_yydebug;
9996
#endif /*YYDEBUG*/
10097

10198
char EXPRESSgetopt_options[256] = "Bbd:e:i:w:p:rvz";
99+
static int no_need_to_work = 0; /* TRUE if we can exit gracefully without doing any work */
100+
101+
void print_fedex_version( void ) {
102+
fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode\n", EXPRESSprogram_name, scl_version() );
103+
no_need_to_work = 1;
104+
}
102105

103106
static void usage( void ) {
104107
fprintf( stderr, "usage: %s [-v] [-d #] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
105-
fprintf( stderr, "where\t-v produces a version description\n" );
108+
fprintf( stderr, "where\t-v produces the following version description:\n" );
109+
print_fedex_version();
106110
fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
107111
fprintf( stderr, "\t-p turns on printing when processing certain objects (see below)\n" );
108112
fprintf( stderr, "\t-w warning enable\n" );
@@ -131,8 +135,6 @@ int main( int argc, char ** argv ) {
131135
int no_warnings = 1;
132136
int resolve = 1;
133137
int result;
134-
int no_need_to_work = 0;/* TRUE if we can exit gracefully without */
135-
/* doing any work */
136138

137139
bool buffer_messages = false;
138140
char * filename = 0;
@@ -218,7 +220,7 @@ int main( int argc, char ** argv ) {
218220
}
219221
break;
220222
case 'v':
221-
printf( "%s %s\n%s\n", EXPRESSprogram_name, FEDEXversion(), EXPRESSversion() );
223+
print_fedex_version();
222224
no_need_to_work = 1;
223225
break;
224226
case 'z':

‎src/fedex_plus/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ add_definitions( -DSCL_BASE_DLL_IMPORTS )
4040
ENDIF()
4141

4242
SCL_ADDEXEC(fedex_plus "${fedex_plus_SOURCES}${fedex_plus_EXTRA_SOURCES}" "libexppp;express;base")
43+
44+
add_dependencies( fedex_plus version_string )

‎src/fedex_plus/classes_misc.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ for the STEP Standard Data Access Interface as defined in document
1919
N350 ( August 31, 1993 ) of ISO 10303 TC184/SC4/WG7.
2020
*******************************************************************/
2121

22+
extern char * scl_version();
23+
2224
extern int multiple_inheritance;
2325
/*extern int corba_binding; */
2426

@@ -137,11 +139,11 @@ FILE * FILEcreate( const char * filename ) {
137139
}
138140

139141
fprintf( file, "#ifndef %s\n", fn = StrToConstant( filename ) );
140-
fprintf( file, "#define %s\n", fn );
142+
fprintf( file, "#define %s\n\n", fn );
141143

142-
fprintf( file, "// This file was generated by fedex_plus. You probably don't want to edit\n" );
143-
fprintf( file, "// it since your modifications will be lost if fedex_plus is used to\n" );
144-
fprintf( file, "// regenerate it.\n" );
144+
fprintf( file, "// This file was generated by fedex_plus,\n// %s.\n", scl_version() );
145+
fprintf( file, "// You probably don't want to edit it since your modifications\n" );
146+
fprintf( file, "// will be lost if fedex_plus is used to regenerate it.\n" );
145147
return ( file );
146148

147149
}

‎src/fedex_plus/fedex_main.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@
7878
#include "../express/express.h"
7979
#include "../express/resolve.h"
8080

81+
extern void print_fedex_version( void );
82+
8183
static void fedex_plus_usage( void ) {
8284
fprintf( stderr, "usage: %s [-s|-S] [-a|-A] [-c|-C] [-l|-L] [-v] [-d #] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
8385
fprintf( stderr, "where\t-s or -S uses only single inheritance in the generated C++ classes\n" );
8486
fprintf( stderr, "\t-a or -A generates the early bound access functions for entity classes the old way (without an underscore)\n" );
8587
fprintf( stderr, "\t-c or -C generates C++ classes for use with CORBA (Orbix)\n" );
8688
fprintf( stderr, "\t-l or -L prints logging code in the generated C++ classes\n" );
87-
fprintf( stderr, "\t-v produces a version description\n" );
89+
fprintf( stderr, "\t-v produces the version description below\n" );
8890
fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
8991
fprintf( stderr, "\t-p turns on printing when processing certain objects (see below)\n" );
9092
fprintf( stderr, "\t-w warning enable\n" );
@@ -103,6 +105,7 @@ static void fedex_plus_usage( void ) {
103105
fprintf( stderr, " s schema or file\n" );
104106
fprintf( stderr, " # pass #\n" );
105107
fprintf( stderr, " E everything (all of the above)\n" );
108+
print_fedex_version();
106109
exit( 2 );
107110
}
108111

@@ -120,8 +123,7 @@ int success( Express model ) {
120123

121124
/* This function is called from main() which is part of the NIST Express
122125
Toolkit. It assigns 2 pointers to functions which are called in main() */
123-
void
124-
EXPRESSinit_init() {
126+
void EXPRESSinit_init() {
125127
EXPRESSbackend = print_file;
126128
EXPRESSsucceed = success;
127129
EXPRESSgetopt = Handle_FedPlus_Args;

0 commit comments

Comments
 (0)