blob: e1cca3f6e8265ce2ca68ace79f3332ef5eb81659 (
plain) (
blame)
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
|
- Skip yarn install/build for panmirror (use pre-built from fetch phase)
- Add JVM arguments for Java compatibility
--- src/gwt/build.xml.orig 2025-10-20 20:09:32 UTC
+++ src/gwt/build.xml
@@ -183,19 +183,8 @@ -->
<echo message="panmirror minify: ${panmirror.minify}"/>
<mkdir dir="${panmirror.build.dir}"/>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
- <arg value="install"/>
- <arg value="--network-timeout"/>
- <arg value="240000"/>
- </exec>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
- <arg value="build"/>
- <arg value="--minify"/>
- <arg value="${panmirror.minify}"/>
- <arg value="--sourcemap"/>
- <arg value="true"/>
- <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/>
- </exec>
+ <echo message="Skipping yarn install - using pre-built panmirror"/>
+ <echo message="Skipping yarn build - using pre-built panmirror"/>
<copy todir="${panmirror.build.dir}">
<fileset dir="${panmirror.dir}/dist-rstudio"/>
</copy>
@@ -242,7 +231,7 @@ -->
<arg value="-generateJsInteropExports"/>
<!-- Additional arguments like -logLevel DEBUG -->
<arg value="${gwt.main.module}"/>
- </java>
+ <jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/></java>
</target>
<target name="soyc" description="Generate and show SOYC report">
@@ -313,7 +302,7 @@ -->
<arg line="-bindAddress ${bind.address}"/>
<arg value="-generateJsInteropExports"/>
<arg value="${gwt.main.module}"/>
- </java>
+ <jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/></java>
</target>
<!-- configure props for i18n tasks -->
@@ -438,7 +427,7 @@ -->
<classpath refid="unittest.class.path"/>
<jvmarg value="-Dgwt.args=-sourceLevel ${javac.version}"/>
<arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
- </java>
+ <jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/><jvmarg value="-Duser.home=/usr/ports/devel/RStudio/work-desktop"/><jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/></java>
</target>
<target name="test" depends="unittest">
|
