Skip to content

Installer fixes, reflecting the new pom file structure #8494 #8495

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

Merged
kcondon merged 3 commits into from
Mar 16, 2022
Merged

Installer fixes, reflecting the new pom file structure #8494 #8495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1104f23
Fixed python installer dataverse version parsing to fix #8494
Mar 16, 2022
bf30a31
Fixing the Makefile
landreev Mar 16, 2022
b6bd09c
Fixes the old (perl) installer
landreev Mar 16, 2022
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
2 changes: 1 addition & 1 deletion scripts/installer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ${INSTALL_SCRIPT}: install ${INSTALLER_ZIP_DIR}

${DISTRIBUTION_WAR_FILE}:
@echo copying war file...
@VERSION_NUMBER=`grep -m1 '<version>' ../../pom.xml | sed 's/ *<\/*version>//g'`; export VERSION_NUMBER; \
@VERSION_NUMBER=`grep -m1 '<revision>' ../../modules/dataverse-parent/pom.xml | sed 's/ *<\/*revision>//g'`; export VERSION_NUMBER; \
BUILT_WAR_FILE=../../target/dataverse-$$VERSION_NUMBER.war; export BUILT_WAR_FILE; \
if [ -f $$BUILT_WAR_FILE ]; \
then \
Expand Down
4 changes: 2 additions & 2 deletions scripts/installer/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,15 @@ unless ($postgresonly)

unless ( -f $WARFILE_LOCATION ) {
my $DATAVERSE_VERSION = "";
my $DATAVERSE_POM_FILE = "../../pom.xml";
my $DATAVERSE_POM_FILE = "../../modules/dataverse-parent/pom.xml";
if ( -f $DATAVERSE_POM_FILE )
{
open DPF, $DATAVERSE_POM_FILE;
my $pom_line;
while ($pom_line=<DPF>)
{
chop $pom_line;
if ($pom_line =~/^[ \t]*<version>([0-9\.]+)<\/version>/)
if ($pom_line =~/^[ \t]*<revision>([0-9\.]+)<\/revision>/)
{
$DATAVERSE_VERSION=$1;
last;
Expand Down
4 changes: 2 additions & 2 deletions scripts/installer/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@
warfileVersion = ""
if not os.path.isfile(warfile):
# get dataverse version from pom.xml
tree = ET.ElementTree(file='../../pom.xml')
tree = ET.ElementTree(file='../../modules/dataverse-parent/pom.xml')
for elem in tree.iter("*"):
if elem.tag == '{http://maven.apache.org/POM/4.0.0}version':
if elem.tag == '{http://maven.apache.org/POM/4.0.0}revision':
warfileVersion = elem.text
# only want the first, the rest are dependencies
break
Expand Down