Navigation

← Previous Changeset
Next Changeset →

Changeset 20779

Timestamp:

09/06/07 16:54:12 (1 year ago)

Author:

patrick

Message:

Use VJ_DATA_DIR instead of VRJ_DATA_DIR in order to be consistent with the
spelling of VJ_BASE_DIR.

Files:

juggler/trunk/modules/jackal/config/org/vrjuggler/jccl/config/ConfigBrokerImpl.java (modified) (1 diff)
juggler/trunk/modules/vrjuggler/data/ControlPanel.xml (modified) (1 diff)
juggler/trunk/modules/vrjuggler/plugins/corba_perf_mon/PerformanceMonitor.xml (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjconfig/Info.plist.in (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjconfig/VRJConfig.xml (modified) (3 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/commoneditors/CommonEditors.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/configure.ac (modified) (3 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/cave/CaveEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/display_window/DisplayWindowEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/flock/FlockEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/intersense/IntersenseEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/motionstar/MotionStarEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/pinchglove/PinchGloveEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/proxyeditor/ProxyEditor.xml (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/surfacedisplayeditor/SurfaceDisplayEditor.xml (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjconfig/make.defs.mk.in (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjconfig/org/vrjuggler/vrjconfig/controlpanel/ControlPanelView.java (modified) (2 diffs)
juggler/trunk/modules/vrjuggler/vrjconfig/vrjconfig.bat (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjconfig/vrjconfig.sh.in (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

juggler/trunk/modules/jackal/config/org/vrjuggler/jccl/config/ConfigBrokerImpl.java

r19729	r20779
789	789
790	790	// Get the .jdef search path from the environment.
791		String data_path = service.getenv("VRJ_DATA_DIR");
	791	String data_path = service.getenv("VJ_DATA_DIR");
792	792	String base_path = service.getenv("VJ_BASE_DIR") +
793	793	File.separator + data_path + File.separator +

juggler/trunk/modules/vrjuggler/data/ControlPanel.xml

r18925	r20779
17	17	icon="org/vrjuggler/vrjconfig/images/cluster64.png" />
18	18	<wizard label="Cluster Wizard"
19		wizard_location="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/wizards/ClusterWizard.jar"
	19	wizard_location="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/wizards/ClusterWizard.jar"
20	20	icon="org/vrjuggler/vrjconfig/images/new_cluster_wizard64.png" />
21	21	<wizard label="VR System Wizard"
22		wizard_location="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/wizards/VRSystemWizard.jar"
	22	wizard_location="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/wizards/VRSystemWizard.jar"
23	23	icon="org/vrjuggler/vrjconfig/images/new_cluster_wizard64.png" />
24	24	<category label="Devices" title="Choose a device type"
25	25	icon="org/vrjuggler/vrjconfig/images/devices64.png">
26	26	<wizard label="Add Device Wizard"
27		wizard_location="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/wizards/NewDeviceWizard.jar"
	27	wizard_location="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/wizards/NewDeviceWizard.jar"
28	28	icon="org/vrjuggler/vrjconfig/images/new_device_wizard64.png" />
29	29	<type label="Analog" title="Choose an analog device"

juggler/trunk/modules/vrjuggler/plugins/corba_perf_mon/PerformanceMonitor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<guipanel name="PerformanceMonitor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/PerformanceMonitor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/PerformanceMonitor.jar"
6	6	class="org.vrjuggler.perfmon.PerformanceMonitorGUI"/>
7	7	<dependencies>
8	8	<bean>ConfigBroker</bean>
9		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jfreechart.jar</jar>
10		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jcommon.jar</jar>
11		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">servlet.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">gnujaxp.jar</jar>
	9	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jfreechart.jar</jar>
	10	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jcommon.jar</jar>
	11	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">servlet.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">gnujaxp.jar</jar>
13	13	</dependencies>
14	14	<tree path="/" />

juggler/trunk/modules/vrjuggler/vrjconfig/Info.plist.in

r20212	r20779
56	56	<key>VJ_BASE_DIR</key>
57	57	<string>$JAVAROOT</string>
58		<key>VRJ_DATA_DIR</key>
	58	<key>VJ_DATA_DIR</key>
59	59	<string>share/vrjuggler</string>
60	60	<key>JCCL_DEFINITION_PATH</key>
61		<string>@prefix@/@VRJ_DATA_DIR@/data/definitions</string>
	61	<string>@prefix@/@VJ_DATA_DIR@/data/definitions</string>
62	62	<key>apple.laf.useScreenMenuBar</key>
63	63	<string>true</string>

juggler/trunk/modules/vrjuggler/vrjconfig/VRJConfig.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<guipanel name="Configuration Editor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/VRJConfig.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/VRJConfig.jar"
6	6	class="org.vrjuggler.vrjconfig.VrjConfig" />
7	7	<dependencies>
…	…
15	15	</guipanel>
16	16	<guipanel name="Config Definition Editor">
17		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/VRJConfig.jar"
	17	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/VRJConfig.jar"
18	18	class="org.vrjuggler.vrjconfig.ConfigDefinitionEditor" />
19	19	<dependencies>
…	…
25	25	</guipanel>
26	26	<guipanel name="Control Panel">
27		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/VRJConfig.jar"
	27	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/VRJConfig.jar"
28	28	class="org.vrjuggler.vrjconfig.controlpanel.ControlPanelView" />
29	29	<dependencies>

juggler/trunk/modules/vrjuggler/vrjconfig/commoneditors/CommonEditors.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<service name="PositionalDeviceEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java/CommonEditors.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java/CommonEditors.jar"
6	6	class="org.vrjuggler.vrjconfig.commoneditors.PositionalDeviceEditor"/>
7	7	<dependencies>
…	…
9	9	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
10	10	<jar path="${VJ_BASE_DIR}/${TWEEK_DATA_DIR}/java">ui.jar</jar>
11		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jogl-demos-data.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jogl-demos.jar</jar>
13		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jogl-demos-util.jar</jar>
14		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jogl.jar</jar>
	11	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jogl-demos-data.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jogl-demos.jar</jar>
	13	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jogl-demos-util.jar</jar>
	14	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jogl.jar</jar>
15	15	</dependencies>
16	16	</service>

juggler/trunk/modules/vrjuggler/vrjconfig/configure.ac

r20616	r20779
184	184
185	185	if test "x$ENABLE_VERSIONING" = "xyes" ; then
186		VRJ_VERSION_DOT="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
187		V~~RJ_DATA_VERSION="vrjuggler-$VR~~J_VERSION_DOT"
188		V~~RJ_DATA_DIR="share/vrjuggler-$VR~~J_VERSION_DOT"
189		PLUGIN_DIR_VERSION="vrjuggler-$VRJ_VERSION_DOT"
	186	VJ_VERSION_DOT="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
	187	VJ_DATA_VERSION="vrjuggler-$VJ_VERSION_DOT"
	188	VJ_DATA_DIR="share/vrjuggler-$VJ_VERSION_DOT"
	189	PLUGIN_DIR_VERSION="vrjuggler-$VJ_VERSION_DOT"
190	190
191	191	# If versioning is disabled, then none of the version variables need to be
…	…
194	194	# case.
195	195	else
196		VRJ_DATA_VERSION="vrjuggler"
197		VRJ_DATA_DIR="share/vrjuggler"
	196	VJ_DATA_VERSION="vrjuggler"
	197	VJ_DATA_DIR="share/vrjuggler"
198	198	PLUGIN_DIR_VERSION="vrjuggler"
199	199	fi
…	…
234	234	AC_SUBST(TWEEK_DATA_DIR)
235	235	AC_SUBST(JCCL_DATA_DIR)
236		AC_SUBST(VRJ_DATA_VERSION)
237		AC_SUBST(VRJ_DATA_DIR)
	236	AC_SUBST(VJ_DATA_VERSION)
	237	AC_SUBST(VJ_DATA_DIR)
238	238	AC_SUBST(PLUGIN_DIR_VERSION)
239	239	AC_SUBST(ANT)

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/cave/CaveEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="ProjectionWallEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/CaveEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/CaveEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.cave.CaveEditor"/>
7	7	<dependencies>
…	…
10	10	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
11	11	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/java">TableLayout.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
13	13	</dependencies>
14	14	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/display_window/DisplayWindowEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="DisplayWindowEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/DisplayWindowEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/DisplayWindowEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.display_window.DisplayWindowEditorPanel"/>
7	7	<dependencies>
…	…
11	11	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/java">jgraph.jar</jar>
12	12	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/java">jgraphaddons.jar</jar>
13		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	13	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
14	14	</dependencies>
15	15	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/flock/FlockEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="FlockEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/FlockEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/FlockEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.flock.FlockEditor"/>
7	7	<dependencies>
…	…
10	10	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
11	11	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/java">TableLayout.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
13	13	</dependencies>
14	14	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/intersense/IntersenseEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="IntersenseEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/IntersenseEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/IntersenseEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.intersense.IntersensePanel"/>
7	7	<dependencies>
…	…
9	9	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
10	10	<jar path="${TWEEK_BASE_DIR}/${TWEEK_DATA_DIR}/java">ui.jar</jar>
11		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	11	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
12	12	</dependencies>
13	13	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/motionstar/MotionStarEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="MotionStarEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/MotionStarEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/MotionStarEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.motionstar.MotionStarEditor"/>
7	7	<dependencies>
…	…
10	10	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
11	11	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/java">TableLayout.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
13	13	</dependencies>
14	14	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/pinchglove/PinchGloveEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="PinchGloveEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/PinchGloveEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/PinchGloveEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.pinchglove.PinchGlovePanel"/>
7	7	<dependencies>
…	…
9	9	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
10	10	<jar path="${TWEEK_BASE_DIR}/${TWEEK_DATA_DIR}/java">ui.jar</jar>
11		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	11	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
12	12	</dependencies>
13	13	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/proxyeditor/ProxyEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="ProxyEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/ProxyEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/ProxyEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.proxyeditor.Editor"/>
7	7	<dependencies>
…	…
9	9	<jar path="${JCCL_BASE_DIR}/${JCCL_DATA_DIR}/beans">jccl_editors.jar</jar>
10	10	<jar path="${TWEEK_BASE_DIR}/${TWEEK_DATA_DIR}/java">ui.jar</jar>
11		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jgraph.jar</jar>
12		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">jgraphaddons.jar</jar>
13		<jar path="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/java">CommonEditors.jar</jar>
	11	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jgraph.jar</jar>
	12	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">jgraphaddons.jar</jar>
	13	<jar path="${VJ_BASE_DIR}/${VJ_DATA_DIR}/java">CommonEditors.jar</jar>
14	14	</dependencies>
15	15	</generic>

juggler/trunk/modules/vrjuggler/vrjconfig/customeditors/surfacedisplayeditor/SurfaceDisplayEditor.xml

r18925	r20779
3	3	xsi:noNamespaceSchemaLocation="http://www.vrjuggler.org/tweek/xsd/1.1/beanlist.xsd">
4	4	<generic name="SurfaceDisplayEditor">
5		<file name="${VJ_BASE_DIR}/${VRJ_DATA_DIR}/beans/customeditors/SurfaceDisplayEditor.jar"
	5	<file name="${VJ_BASE_DIR}/${VJ_DATA_DIR}/beans/customeditors/SurfaceDisplayEditor.jar"
6	6	class="org.vrjuggler.vrjconfig.customeditors.surfacedisplayeditor.SurfaceDisplayEditor"/>
7	7	<dependencies>

juggler/trunk/modules/vrjuggler/vrjconfig/make.defs.mk.in

r19729	r20779
53	53	# Base variables needed by all makefiles.
54	54	# -----------------------------------------------------------------------------
55		projdatadir= $(datadir)/@VRJ_DATA_VERSION@
	55	projdatadir= $(datadir)/@VJ_DATA_VERSION@
56	56	releasedir= @JUGGLERROOT_ABS@/release
57	57	scriptdir= $(releasedir)/scripts

juggler/trunk/modules/vrjuggler/vrjconfig/org/vrjuggler/vrjconfig/controlpanel/ControlPanelView.java

r19729	r20779
90	90	// and viewers get loaded.
91	91	String default_path = env_svc.getenv("VJ_BASE_DIR") +
92		File.separator + env_svc.getenv("VRJ_DATA_DIR") +
	92	File.separator + env_svc.getenv("VJ_DATA_DIR") +
93	93	File.separator + "beans" +
94	94	File.separator + "customeditors";
…	…
173	173	String controlpanel_path =
174	174	env_service.expandEnvVars(
175		"${VJ_BASE_DIR}/${VRJ_DATA_DIR}/data/ControlPanel.xml"
	175	"${VJ_BASE_DIR}/${VJ_DATA_DIR}/data/ControlPanel.xml"
176	176	);
177	177	ControlPanelViewModel model =

juggler/trunk/modules/vrjuggler/vrjconfig/vrjconfig.bat

r20754	r20779
73	73	set jccl_def_arg=-DJCCL_DEFINITION_PATH="%JCCL_DEFINITION_PATH%"
74	74	:RUNJAVA
75		"%JAVA_HOME%\bin\java" -Dsun.java2d.opengl=True -DTWEEK_BASE_DIR="%TWEEK_BASE_DIR%" -DTWEEK_DATA_DIR="share\tweek" -DJCCL_BASE_DIR="%JCCL_BASE_DIR%" -DJCCL_DATA_DIR="share\jccl" -DVJ_BASE_DIR="%VJ_BASE_DIR%" -DVRJ_DATA_DIR="share\vrjuggler" %jccl_def_arg% -Djava.library.path="%TWEEK_BASE_DIR%\share\tweek\java\%PROCESSOR_ARCHITECTURE%" -Djava.security.policy="%TWEEK_BASE_DIR%\share\tweek\java\java.security.policy.txt" -cp "%TWEEK_BASE_DIR%\share\tweek\java\jaxen-core.jar;%TWEEK_BASE_DIR%\share\tweek\java\jaxen-jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\saxpath.jar;%TWEEK_BASE_DIR%\share\tweek\java\xalan.jar;%TWEEK_BASE_DIR%\share\tweek\java\xerces.jar;%TWEEK_BASE_DIR%\share\tweek\java\xml-apis.jar;%TWEEK_BASE_DIR%\share\tweek\java\Tweek.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeans.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekEvents.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekNet.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeanDelivery.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekServices.jar;%TWEEK_BASE_DIR%\share\tweek\java\kunststoff-mod.jar;%TWEEK_BASE_DIR%\share\tweek\java\liquidlnf.jar;%TWEEK_BASE_DIR%\share\tweek\java\metouia.jar;%TWEEK_BASE_DIR%\share\tweek\java\looks.jar" org.vrjuggler.tweek.Tweek --beanpath="%JCCL_BASE_DIR%\share\jccl\beans" --beanpath="%VJ_BASE_DIR%\share\vrjuggler\beans" --defaultbean="Configuration Editor" %*
	75	"%JAVA_HOME%\bin\java" -Dsun.java2d.opengl=True -DTWEEK_BASE_DIR="%TWEEK_BASE_DIR%" -DTWEEK_DATA_DIR="share\tweek" -DJCCL_BASE_DIR="%JCCL_BASE_DIR%" -DJCCL_DATA_DIR="share\jccl" -DVJ_BASE_DIR="%VJ_BASE_DIR%" -DVJ_DATA_DIR="share\vrjuggler" %jccl_def_arg% -Djava.library.path="%TWEEK_BASE_DIR%\share\tweek\java\%PROCESSOR_ARCHITECTURE%" -Djava.security.policy="%TWEEK_BASE_DIR%\share\tweek\java\java.security.policy.txt" -cp "%TWEEK_BASE_DIR%\share\tweek\java\jaxen-core.jar;%TWEEK_BASE_DIR%\share\tweek\java\jaxen-jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\saxpath.jar;%TWEEK_BASE_DIR%\share\tweek\java\xalan.jar;%TWEEK_BASE_DIR%\share\tweek\java\xerces.jar;%TWEEK_BASE_DIR%\share\tweek\java\xml-apis.jar;%TWEEK_BASE_DIR%\share\tweek\java\Tweek.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeans.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekEvents.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekNet.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeanDelivery.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekServices.jar;%TWEEK_BASE_DIR%\share\tweek\java\kunststoff-mod.jar;%TWEEK_BASE_DIR%\share\tweek\java\liquidlnf.jar;%TWEEK_BASE_DIR%\share\tweek\java\metouia.jar;%TWEEK_BASE_DIR%\share\tweek\java\looks.jar" org.vrjuggler.tweek.Tweek --beanpath="%JCCL_BASE_DIR%\share\jccl\beans" --beanpath="%VJ_BASE_DIR%\share\vrjuggler\beans" --defaultbean="Configuration Editor" %*
76	76	GOTO DONE
77	77	:ERREXIT

juggler/trunk/modules/vrjuggler/vrjconfig/vrjconfig.sh.in

r19729	r20779
43	43
44	44	# Sanity check the $VJ_BASE_DIR setting.
45		if test ! -d "$VJ_BASE_DIR/@VRJ_DATA_DIR@/beans" ; then
46		echo "FATAL ERROR: Directory $VJ_BASE_DIR/@VRJ_DATA_DIR@/beans does not exist!"
	45	if test ! -d "$VJ_BASE_DIR/@VJ_DATA_DIR@/beans" ; then
	46	echo "FATAL ERROR: Directory $VJ_BASE_DIR/@VJ_DATA_DIR@/beans does not exist!"
47	47	exit 1
48	48	fi
…	…
70	70	fi
71	71
72		EXTRA_JDK_ARGS="-Dsun.java2d.opengl=True -DTWEEK_DATA_DIR=@TWEEK_DATA_DIR@ -DJCCL_DATA_DIR=@JCCL_DATA_DIR@ -DV~~RJ_DATA_DIR=@VR~~J_DATA_DIR@ -DJCCL_BASE_DIR=${JCCL_BASE_DIR} -DTWEEK_BASE_DIR=${TWEEK_BASE_DIR} -DVJ_BASE_DIR=${VJ_BASE_DIR} $jccl_def_arg"
	72	EXTRA_JDK_ARGS="-Dsun.java2d.opengl=True -DTWEEK_DATA_DIR=@TWEEK_DATA_DIR@ -DJCCL_DATA_DIR=@JCCL_DATA_DIR@ -DVJ_DATA_DIR=@VJ_DATA_DIR@ -DJCCL_BASE_DIR=${JCCL_BASE_DIR} -DTWEEK_BASE_DIR=${TWEEK_BASE_DIR} -DVJ_BASE_DIR=${VJ_BASE_DIR} $jccl_def_arg"
73	73
74	74	APP_NAME='VRJConfig'
…	…
76	76	. $TWEEK_BASE_DIR/bin/tweek-base.sh \
77	77	--beanpath="$JCCL_BASE_DIR/@JCCL_DATA_DIR@/beans" \
78		--beanpath="$VJ_BASE_DIR/@VRJ_DATA_DIR@/beans" \
	78	--beanpath="$VJ_BASE_DIR/@VJ_DATA_DIR@/beans" \
79	79	--defaultbean="Configuration Editor" "$@"
80	80

Navigation

Changeset 20779

Legend:

Download in other formats: