Package: inventor / 2.1.5-10-21

configurability.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
Description: Configuration changes to fit in Debian system
 This patch mainly contains changes that
   1. adapt directory structure; or
   2. allow configuring external program, e.g. PDF reader
Author: Steve M. Robbins <smr@debian.org>

--- inventor-2.1.5-10.orig/apps/samples/widgets/MyTextureEd.c++
+++ inventor-2.1.5-10/apps/samples/widgets/MyTextureEd.c++
@@ -228,7 +228,7 @@ struct PaletteStruct {
 
 
 static char *customTextureDir = ".textures";
-static char *defaultDir = IVPREFIX "/share/data/textures";
+static char *defaultDir = IVTEXTURESDIR;
 static char *editorTitle = "Texture Editor";
 static char *noFileNameStr = "<empty>";
 
--- inventor-2.1.5-10.orig/apps/samples/widgets/MyMtlPal.c++
+++ inventor-2.1.5-10/apps/samples/widgets/MyMtlPal.c++
@@ -193,7 +193,7 @@ static MenuStruct pulldownData[] = {
 };
 
 static char *editorTitle = "Material Palette";
-static char *defaultDir = IVPREFIX "/share/data/materials";
+static char *defaultDir = IVMATERIALSDIR;
 
 
 static char *geometryBuffer = "\
--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.RUNME
+++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.RUNME
@@ -1,3 +1,3 @@
 #!/bin/sh
 #Tag 0x00010510
-/usr/demos/Inventor/qmorf /usr/share/data/models/CyberHeads/*.iv
+/usr/lib/inventor/qmorf /usr/share/inventor/data/models/CyberHeads/*.iv
--- inventor-2.1.5-10.orig/apps/demos/qmorf/qmorf.c++
+++ inventor-2.1.5-10/apps/demos/qmorf/qmorf.c++
@@ -413,8 +413,7 @@ parse_args(int argc, char **argv)
 	fprintf(stderr, "At least two files must be given, and "
 		"they must contain QuadMeshes (qmorf can\n");
 	fprintf(stderr, "only morph QuadMesh nodes).\n");
-	fprintf(stderr, "The directory "
-		IVPREFIX "/share/data/models/CyberHeads "
+	fprintf(stderr, "The directory " IVDATADIR "/CyberHeads "
 		"contains good data to morph.\n");
 
 	exit(7);
@@ -436,24 +435,24 @@ quitCallback(Widget, XtPointer, XtPointe
 void
 showAboutDialog(Widget, XtPointer, XtPointer)
 {
-    if (access(IVPREFIX "/demos/Inventor/qmorf.about", R_OK) != 0)
+    if (access(IVDEMOBINDIR"/qmorf.about", R_OK) != 0)
     {
 	system("xmessage 'Sorry, could not find "
-	       IVPREFIX "/demos/Inventor/qmorf.about' > /dev/null");
+	       IVDEMOBINDIR"/qmorf.about' > /dev/null");
 	return;
     }
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err)
     {
-	system("xmessage 'You must install acroread"
+	system("xmessage 'You must install " PDFVIEWER
 	       " for this function to work' > /dev/null");
 	return;
     }
 
-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/qmorf.about &");
+    sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/qmorf.about &");
     system(command);
 }	
 
--- inventor-2.1.5-10.orig/apps/demos/gview/gview.RUNME
+++ inventor-2.1.5-10/apps/demos/gview/gview.RUNME
@@ -1,3 +1,3 @@
 #!/bin/sh
 #Tag 0x00010510
-/usr/demos/Inventor/gview /usr/demos/data/Inventor/windmill.iv
+/usr/lib/inventor/gview /usr/share/inventor/data/demos/windmill.iv
--- inventor-2.1.5-10.orig/apps/demos/gview/DisplayGraph.c++
+++ inventor-2.1.5-10/apps/demos/gview/DisplayGraph.c++
@@ -67,7 +67,7 @@ SoNode	*DisplayGraph::otherIcon;
 SbDict	*DisplayGraph::iconDict;
 
 #define ICON_FILE	"gviewIcons.iv"
-#define ICON_INST_DIR	IVPREFIX "/demos/data/Inventor"
+#define ICON_INST_DIR	IVDEMODATADIR
 #define ICON_ENV_VAR	"IV_GRAPH_DIR"
 
 ////////////////////////////////////////////////////////////////////////
--- inventor-2.1.5-10.orig/apps/demos/textomatic/textomatic.c++
+++ inventor-2.1.5-10/apps/demos/textomatic/textomatic.c++
@@ -160,24 +160,24 @@ profileCallback(void *data, SoSensor *)
 void
 showAboutDialog(Widget, XtPointer, XtPointer)
 {
-    if (access(IVPREFIX "/demos/Inventor/textomatic.about", R_OK) != 0)
+    if (access(IVDEMOBINDIR"/textomatic.about", R_OK) != 0)
     {
 	system("xmessage 'Sorry, could not find "
-	       IVPREFIX "/demos/Inventor/textomatic.about' > /dev/null");
+	       IVDEMOBINDIR"/textomatic.about' > /dev/null");
 	return;
     }
 
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err) {
-	system("xmessage 'You must install acroread"
+	system("xmessage 'You must install " PDFVIEWER
 	       " for this function to work' > /dev/null");
 	return;
     }
 
-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/textomatic.about &");
+    sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/textomatic.about &");
     system(command);
 }	
 
--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SoSceneViewer.c++
+++ inventor-2.1.5-10/apps/demos/SceneViewer/SoSceneViewer.c++
@@ -4734,26 +4734,26 @@ SoSceneViewer::showAboutDialog()
 //
 ////////////////////////////////////////////////////////////////////////
 {
-    if (access(IVPREFIX "/demos/Inventor/SceneViewer.about", R_OK) != 0)
+    if (access(IVDEMOBINDIR "/SceneViewer.about", R_OK) != 0)
     {
 	system("xmessage 'Sorry, could not find "
-	       IVPREFIX "/demos/Inventor/SceneViewer.about' > /dev/null");
+	       IVDEMOBINDIR "/SceneViewer.about' > /dev/null");
 	return;
     }
 
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err)
     {
-	system("xmessage 'You must install acroread"
+	system("xmessage 'You must install " PDFVIEWER
 	       " for this function to work' > /dev/null");
 	return;
     }
 
-    sprintf(command, "acroread "
-            IVPREFIX "/demos/Inventor/SceneViewer.about &");
+    sprintf(command, PDFVIEWER " "
+            IVDEMOBINDIR "/SceneViewer.about &");
     system(command);
 }
 
--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/SceneViewer.RUNME
+++ inventor-2.1.5-10/apps/demos/SceneViewer/SceneViewer.RUNME
@@ -1,4 +1,4 @@
 #!/bin/sh
 #Tag 0x00010510
-cd /usr/share/data/models
-/usr/demos/Inventor/SceneViewer /usr/demos/data/Inventor/jackInTheBox.iv
+cd /usr/share/inventor/data/models
+/usr/lib/inventor/SceneViewer /usr/share/inventor/data/demos/jackInTheBox.iv
--- inventor-2.1.5-10.orig/apps/demos/noodle/Interface.c++
+++ inventor-2.1.5-10/apps/demos/noodle/Interface.c++
@@ -399,23 +399,23 @@ Interface::createOkayCancelDialog(Widget
 void
 Interface::showAboutDialog()
 {
-   if (access(IVPREFIX "/demos/Inventor/noodle.about", R_OK) != 0) {
+   if (access(IVDEMOBINDIR"/noodle.about", R_OK) != 0) {
         system("xmessage 'Sorry, could not find "
-               IVPREFIX "/demos/Inventor/noodle.about' > /dev/null");
+               IVDEMOBINDIR"/noodle.about' > /dev/null");
         return;
     }
 
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err) {
-        system("xmessage 'You must install acroread"
+        system("xmessage 'You must install " PDFVIEWER
                " for this function to work' > /dev/null");
         return;
     }
 
-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/noodle.about &");
+    sprintf(command, PDFVIEWER " " IVDEMOBINDIR"/noodle.about &");
     system(command);
 }
 
--- inventor-2.1.5-10.orig/apps/demos/noodle/noodle.RUNME
+++ inventor-2.1.5-10/apps/demos/noodle/noodle.RUNME
@@ -1,3 +1,3 @@
 #!/bin/sh
 #Tag 0x00010510
-cd /usr/demos/data/Inventor; /usr/demos/Inventor/noodle
+cd /usr/share/inventor/data/demos; /usr/lib/inventor/noodle
--- inventor-2.1.5-10.orig/apps/demos/revo/revo.c++
+++ inventor-2.1.5-10/apps/demos/revo/revo.c++
@@ -78,25 +78,25 @@ extern void clearPoints();
 void
 showAboutDialog(Widget, XtPointer, XtPointer)
 {
-    if (access(IVPREFIX "/demos/Inventor/revo.about", R_OK) != 0)
+    if (access(IVDEMOBINDIR "/revo.about", R_OK) != 0)
     {
 	system("xmessage 'Sorry, could not find "
-	       IVPREFIX "/demos/Inventor/revo.about' > /dev/null");
+	       IVDEMOBINDIR "/revo.about' > /dev/null");
 	return;
     }
 
     char command[100];
-    sprintf(command, "which acroread >& /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err)
     {
-	system("xmessage 'You must install acroread"
+	system("xmessage 'You must install " PDFVIEWER
 	       " for this function to work' > /dev/null");
 	return;
     }
 
-    sprintf(command, "acroread " IVPREFIX "/demos/Inventor/revo.about &");
+    sprintf(command, PDFVIEWER " " IVDEMOBINDIR "/revo.about &");
     system(command);
 }	
 
--- inventor-2.1.5-10.orig/apps/tools/ivview/ivview.c++
+++ inventor-2.1.5-10/apps/tools/ivview/ivview.c++
@@ -715,23 +715,23 @@ countUpdatesCB(void *, SoAction *action)
 static void
 showAboutDialog()
 {
-   if (access(IVPREFIX "/share/help/ivview/ivview.about", R_OK) != 0) {
+   if (access(IVHELPDIR"/ivview/ivview.about", R_OK) != 0) {
         system("xmessage 'Sorry, could not find "
-               IVPREFIX "/share/help/ivview/ivview.about' > /dev/null");
+               IVHELPDIR"/ivview/ivview.about' > /dev/null");
         return;
     }
 
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
 
     int err = system(command);
     if (err) {
-        system("xmessage 'You must install acroread"
+        system("xmessage 'You must install " PDFVIEWER
                " for this function to work' > /dev/null");
         return;
     }
 
-    sprintf(command, "acroread " IVPREFIX "/share/help/ivview/ivview.about &");
+    sprintf(command, PDFVIEWER " "IVHELPDIR"/ivview/ivview.about &");
     system(command);
 }
 
--- inventor-2.1.5-10.orig/libSoXt/src/SoXtClipboard.c++
+++ inventor-2.1.5-10/libSoXt/src/SoXtClipboard.c++
@@ -658,7 +658,7 @@ SoXtClipboard::convertData(
     char conversionCmd[BUFSIZE];
     const char *infile = tmpfile.getString();
     const char *outfile = tmpfile2.getString();
-    sprintf(conversionCmd, IVPREFIX "/bin/ivdowngrade -v 2.0 %s %s", infile, outfile);
+    sprintf(conversionCmd, IVBINDIR "/ivdowngrade -v 2.0 %s %s", infile, outfile);
     
     if (system(conversionCmd) == -1) {
 	#ifdef DEBUG
--- inventor-2.1.5-10.orig/libSoXt/src/SoXtComponent.c++
+++ inventor-2.1.5-10/libSoXt/src/SoXtComponent.c++
@@ -76,7 +76,7 @@
 
 static char *helpDialogTitle = "Help Card Error Dialog";
 static char *helpCardError = "Inventor Help Cards not installed.";
-static char *helpPrgError = "acroread not installed on this system.";
+static char *helpPrgError = PDFVIEWER " not installed on this system.";
 static char *thisClassName = "SoXtComponent";
 
 // static members
@@ -561,7 +561,7 @@ SoXtComponent::unregisterWidget(Widget w
 //  card given the file name. By default the file will be searched using:
 //	    1) current working directory
 //	    2) SO_HELP_DIR environment variable
-//	    3) $(IVPREFIX)/share/help/Inventor
+//	    3) IVHELPDIR/Inventor
 //	    4) else bring a "No help card found message"
 //
 // Use: protected
@@ -573,7 +573,7 @@ SoXtComponent::openHelpCard(const char *
 {
     char pgrCmd[100];
     char cardPath[100];
-    strcpy(pgrCmd, "acroread ");
+    strcpy(pgrCmd, PDFVIEWER " ");
     
 #if 0
     // ??? make showcase come up single buffered on the Indigo. This should
@@ -591,7 +591,7 @@ SoXtComponent::openHelpCard(const char *
 #endif
 
     char command[100];
-    sprintf(command, "which acroread > /dev/null");
+    sprintf(command, "which " PDFVIEWER " > /dev/null");
     if (system(command) != 0) {
 	SoXt::createSimpleErrorDialog(_baseWidget, helpDialogTitle, helpPrgError);
 	return;
@@ -622,7 +622,7 @@ SoXtComponent::openHelpCard(const char *
     }
     
     // else check for the default location
-    strcpy(cardPath, IVPREFIX "/share/help/Inventor/");
+    strcpy(cardPath, IVHELPDIR"/Inventor/");
     strcat(cardPath, cardName);
     if ( access(cardPath, R_OK) == 0 ) {
 	strcat(pgrCmd, cardPath);
--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlList.c++
+++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlList.c++
@@ -264,7 +264,7 @@ SoXtMaterialList::constructorCommon(cons
     setClassName("SoXtMaterialList");
     if (dir != NULL)
 	materialDir = strdup(dir);
-    else materialDir = strdup(IVPREFIX "/share/data/materials");
+    else materialDir = strdup(IVMATERIALSDIR);
 
     callbackList = new SoCallbackList;
     curPalette = -1;
--- inventor-2.1.5-10.orig/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
+++ inventor-2.1.5-10/libSoXt/src/mtlEdit/SoXtMtlEdit.c++
@@ -156,7 +156,7 @@ static char *deftitles[]={
 	"Material Emissive Color"
 };
 
-static char *mtlDir  = IVPREFIX "/share/data/materials";
+static char *mtlDir  = IVMATERIALSDIR;
 
 static char *slider_labels[] = { (char *)NULL, (char *)NULL, (char *)NULL,
 				 (char *)NULL, (char *)NULL, (char *)NULL
--- inventor-2.1.5-10.orig/libFL/ang/fl.c
+++ inventor-2.1.5-10/libFL/ang/fl.c
@@ -95,7 +95,7 @@ static FLfontImpl *fontImplTable[] = {
   NULL
 };
 
-static char *fontPath = IVPREFIX "/share/data/fonts";
+static char *fontPath = IVFONTPATH;
 int fl_debug = FALSE;
 
 /*