Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stax removal from source tree #87

Open
wants to merge 5 commits into
base: trunk
Choose a base branch
from
Open

Stax removal from source tree #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad38db1
fix unitialized variables in delivery.pl by treat undef as 0
leginee Apr 25, 2020
d7d4a29
Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/openoffic…
leginee May 2, 2020
5597a2f
Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/openoffic…
leginee May 7, 2020
85644bf
remove stax folder from build
leginee May 24, 2020
5f20e1b
remove the config to the stax build
leginee May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified main/config.guess
100644 → 100755
View file
Open in desktop
Empty file.
13 changes: 0 additions & 13 deletions main/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3647,19 +3647,6 @@ else
fi
AC_SUBST(GPERF)

dnl ===================================================================
dnl Check for building stax
dnl ===================================================================
AC_MSG_CHECKING([whether to build the stax])
if test -f "./stax/download/stax-1.2.0.jar"; then
BUILD_STAX=NO
AC_MSG_RESULT([no, will use the prebuilt stax/download/stax-1.2.0.jar])
else
BUILD_STAX=YES
AC_MSG_RESULT([yes])
fi
AC_SUBST(BUILD_STAX)

dnl ===================================================================
dnl Check for building ODK
dnl ===================================================================
Expand Down
6 changes: 0 additions & 6 deletions main/external_deps.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,6 @@ if (SOLAR_JAVA == TRUE)
URL1 = https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

if (SOLAR_JAVA == TRUE)
MD5 = 980143f96b3f6ce45d2e4947da21a5e9
name = stax-src-1.2.0.zip
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip

if (ENABLE_MEDIAWIKI == YES)
MD5 = a7983f859eafb2677d7ff386a023bc40
name = xsltml_2.1.2.zip
Expand Down
2 changes: 1 addition & 1 deletion main/saxon/prj/build.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xx saxon : solenv stax NULL
xx saxon : solenv NULL
xx saxon nmake - all xx_saxon NULL
1 change: 0 additions & 1 deletion main/set_soenv.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2018,7 +2018,6 @@ ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" );
ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
Expand Down
3 changes: 3 additions & 0 deletions main/solenv/bin/deliver.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,9 @@ sub get_latest_patchlevel

for ($i = 0; $i < 3; $i++)
{
# if unitialized assign 0 as default value.
$field_a[$i] //= 0;
$field_b[$i] //= 0;
if ( ($field_a[$i] < $field_b[$i]) ) {
return -1;
}
Expand Down
13 changes: 0 additions & 13 deletions main/stax/download/README_stax-1.2.0.jar.txt
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions main/stax/makefile.mk
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions main/stax/prj/build.lst
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion main/stax/prj/d.lst
View file
Open in desktop

This file was deleted.