Project

General

Profile

« Previous | Next » 

Revision 9874

Added by Matt Jones about 8 years ago

Migrate the metacat build.xml to use Git for EML files rather than SVN. This addresses issue #7076 for the trunk, but will need to be checked and possibly merged into release branches as needed.

View differences:

build.xml
233 233
		<property name="schema-cvsrelpath" value="lib${schema-relpath}" />
234 234
		<property name="style-skins-relpath" value="/style/skins" />
235 235
		<property name="seek-tag" value="tags/ECOGRID_1_2_3" />
236
		<property name="eml.git.repository.url" value="https://github.com/NCEAS/eml.git" />
236 237
		<property name="eml-module" value="eml" />
237 238
		<property name="eml-version" value="2.0.0beta6" />
238
		<property name="eml-beta4-version" value="2.0.0beta4" />
239
		<property name="eml-beta-tag"
240
			value="BRANCH_EML_2_0_0_BETA_6_FOR_METACAT" />
241
		<property name="eml-beta4-tag"
242
					value="RELEASE_EML_2_BETA_4" />
243
		<property name="eml2_0_0-schema-tag"
244
			value="RELEASE_EML_2_0_0_UPDATE_1" />
239
		<property name="eml-beta4-version"   value="2.0.0beta4" />
240
		<property name="eml-beta-tag"        value="BRANCH_EML_2_0_0_BETA_6_FOR_METACAT" />
241
		<property name="eml-beta4-tag"       value="RELEASE_EML_2_BETA_4" />
242
		<property name="eml2_0_0-schema-tag" value="RELEASE_EML_2_0_0_UPDATE_1" />
245 243
		<property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
246 244
		<property name="eml2_1_0-schema-tag" value="RELEASE_EML_2_1_0" />
247 245
		<property name="eml2_1_1-schema-tag" value="RELEASE_EML_2_1_1" />
......
395 393
			value="${svnant.lib}/svnjavahl.jar" />
396 394
		<property name="svn.ecogridUrl"
397 395
			value="https://code.ecoinformatics.org/code/seek/${seek-tag}/projects/ecogrid/" />
398
		<property name="svn.emlBetaUrl"
399
			value="https://code.ecoinformatics.org/code/eml/branches/${eml-beta-tag}" />
400
		<property name="svn.emlBeta4Url"
401
					value="https://code.ecoinformatics.org/code/eml/tags/${eml-beta4-tag}" />
402
		<property name="svn.eml200SchemaUrl"
403
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_0_0-schema-tag}" />
404
		<property name="svn.eml201SchemaUrl"
405
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_0_1-schema-tag}" />
406
		<property name="svn.eml210SchemaUrl"
407
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_0-schema-tag}" />
408
		<property name="svn.eml211SchemaUrl"
409
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_1_1-schema-tag}" />
410
		<property name="svn.eml2StyleUrl"
411
			value="https://code.ecoinformatics.org/code/eml/${eml2-style-tag}" />
412 396
		
413
		<!-- the git repo -->
397
		<!-- the git repo for metacatUI-->
414 398
		<property name="metacatui.git.repository.url"
415 399
					value="https://github.com/NCEAS/metacatui.git" />
416 400
		<property name="metacatui.git.repository.refname"
......
434 418
		<condition property="eml.required">
435 419
			<or>
436 420
				<not>
421
					<available file="lib/schema/eml-2.1.1/eml.xsd" />
422
				</not>
423
				<not>
424
					<available file="lib/schema/eml-2.1.0/eml.xsd" />
425
				</not>
426
				<not>
437 427
					<available file="lib/schema/eml-2.0.1/eml.xsd" />
438 428
				</not>
439 429
				<not>
440 430
					<available file="lib/schema/eml-2.0.0/eml.xsd" />
441 431
				</not>
442 432
				<not>
443
					<available file="lib/schema/eml-2.1.0/eml.xsd" />
444
				</not>
445
				<not>
446 433
					<available
447 434
						file="lib/dtd/eml-dataset-2.0.0beta6.dtd" />
448 435
				</not>
......
612 599

  
613 600
	<target name="getemlpre2" depends="prepare" if="eml.required"
614 601
		description="Checks EML-beta6 out of svn and copies dtds and xsl to your metacat sandbox">
615
		<svn>
616
			<export srcUrl="${svn.emlBetaUrl}"
617
				destPath="${build.tmp}/eml_${eml-beta-tag}" />
618
		</svn>
619 602
		<mkdir dir="lib/dtd" />
620 603
		<copy todir="lib/dtd" filtering="yes">
621 604
			<fileset
......
636 619
	
637 620
	<target name="getemlpre2beta4" depends="prepare" if="eml.required"
638 621
			description="Checks EML-beta4 out of svn and copies dtds to your metacat sandbox">
639
			<svn>
640
				<export srcUrl="${svn.emlBeta4Url}"
641
					destPath="${build.tmp}/eml_${eml-beta4-tag}" />
642
			</svn>
643 622
			<mkdir dir="lib/dtd" />
644 623
			<copy todir="lib/dtd" filtering="yes">
645 624
				<fileset
......
649 628
				<mapper type="glob" from="eml-*.dtd"
650 629
					to="eml-*-${eml-beta4-version}.dtd" />
651 630
			</copy>
631
	</target>
652 632

  
653
			<!--
654
			<copy todir="${style-common-cvsrelpath}" filtering="yes">
655
				<fileset
656
					dir="${build.tmp}/eml_${eml-beta4-tag}/style">
657
					<include name="**/*.xsl" />
658
				</fileset>
659
			</copy>
660
			-->
661
		</target>
633
    <target name="giteml" depends="prepare" if="eml.required"
634
            description="Git clone EML code from various tagged releases of the EML git repository">
635
        <git-clone-pull repository="${eml.git.repository.url}" 
636
                        dest="${build.tmp}/eml_${eml-beta4-tag}" refname="${eml-beta4-tag}" />
637
        <git-clone-pull repository="${eml.git.repository.url}" 
638
                        dest="${build.tmp}/eml_${eml-beta-tag}" refname="${eml-beta-tag}" />
639
        <git-clone-pull repository="${eml.git.repository.url}" 
640
                        dest="${build.tmp}/eml_${eml2_0_0-schema-tag}" refname="${eml2_0_0-schema-tag}" />
641
        <git-clone-pull repository="${eml.git.repository.url}" 
642
                        dest="${build.tmp}/eml_${eml2_0_1-schema-tag}" refname="${eml2_0_1-schema-tag}" />
643
        <git-clone-pull repository="${eml.git.repository.url}" 
644
                        dest="${build.tmp}/eml_${eml2_1_0-schema-tag}" refname="${eml2_1_0-schema-tag}" />
645
        <git-clone-pull repository="${eml.git.repository.url}" 
646
                        dest="${build.tmp}/eml_${eml2_1_1-schema-tag}" refname="${eml2_1_1-schema-tag}" />
647
        <git-clone-pull repository="${eml.git.repository.url}" 
648
                        dest="${build.tmp}/eml_${eml2-style-tag}" refname="master" />
649
    </target>
662 650

  
663
	<target name="geteml2+" depends="prepare" if="eml.required"
651
	<target name="geteml2+" depends="prepare,giteml" if="eml.required"
664 652
		description="Checks eml-2 out of svn and copies schema and xsl to your metacat sandbox">
665
		<svn>
666
			<export srcUrl="${svn.eml200SchemaUrl}"
667
				destPath="${build.tmp}/eml_${eml2_0_0-schema-tag}" />
668
		</svn>
653
		<!-- Checkout eml200 for given schema tag-->
669 654
		<mkdir dir="lib/schema/eml-2.0.0" />
670 655
		<copy todir="lib/schema/eml-2.0.0" filtering="yes">
671 656
			<fileset
......
676 661
			<!-- shouldn't we have a mapper here like this??
677 662
				<mapper type="glob" from="eml-*.xsd" to="eml-*-${eml-version}.xsd" />
678 663
				
679
				Jing's code didn't nave one - does it need to be added?
664
				Jing's code didn't have one - does it need to be added?
680 665
				NOTE that eml-version is set to beta 6, so this would need changing -->
681 666

  
682 667
		</copy>
683
		<!-- <antcall target="copyxsl">
684
			<param name="cvs.tagname" value="${eml2_0_0-schema-tag}" />
685
			<param name="dirname" value="eml-2.0.0" />
686
			</antcall> -->
687 668

  
688 669
		<!-- Checkout eml201 for given schema tag-->
689
		<svn>
690
			<export srcUrl="${svn.eml201SchemaUrl}"
691
				destPath="${build.tmp}/eml_${eml2_0_1-schema-tag}" />
692
		</svn>
693 670
		<mkdir dir="lib/schema/eml-2.0.1" />
694 671
		<copy todir="lib/schema/eml-2.0.1" filtering="yes">
695 672
			<fileset
......
698 675
			</fileset>
699 676
		</copy>
700 677

  
701
		<!-- Checkout eml201 again for given style sheet tag-->
702
		<!-- echo>Enter CVS password: </echo>
703
			<cvs cvsRoot="${cvsroot}"
704
			package="${eml-module}"
705
			tag="${eml2_0_1-style-tag}"
706
			dest="${build.tmp}/eml_${eml2_0_1-style-tag}" />
707
			<antcall target="copyxsl">
708
			<param name="cvs.tagname" value="${eml2_0_1-style-tag}" />
709
			<param name="dirname" value="eml-2.0.1" />
710
			</antcall -->
711

  
712 678
		<!-- Checkout eml210 for given schema tag-->
713
		<svn>
714
			<export srcUrl="${svn.eml210SchemaUrl}"
715
				destPath="${build.tmp}/eml_${eml2_1_0-schema-tag}" />
716
		</svn>
717 679
		<mkdir dir="lib/schema/eml-2.1.0" />
718 680
		<copy todir="lib/schema/eml-2.1.0" filtering="yes">
719 681
			<fileset
......
723 685
		</copy>
724 686

  
725 687
		<!-- Checkout eml210 for given style sheet tag-->
726
		<svn>
727
			<export srcUrl="${svn.eml2StyleUrl}"
728
				destPath="${build.tmp}/eml_${eml2-style-tag}" />
729
		</svn>
730 688
		<antcall target="copyxsl">
731 689
			<param name="cvs.tagname" value="${eml2-style-tag}" />
732 690
			<!-- param name="dirname" value="eml-2.1.0" / -->
733 691
			<param name="dirname" value="eml-2" />
734 692
		</antcall>
735 693
		
736
		<!-- Checkout eml210 for given schema tag-->
737
		<svn>
738
			<export srcUrl="${svn.eml211SchemaUrl}"
739
				destPath="${build.tmp}/eml_${eml2_1_1-schema-tag}" />
740
		</svn>
694
		<!-- Checkout eml211 for given schema tag-->
741 695
		<mkdir dir="lib/schema/eml-2.1.1" />
742 696
		<copy todir="lib/schema/eml-2.1.1" filtering="yes">
743 697
			<fileset
......
1093 1047
		</copy>
1094 1048
	</target>
1095 1049

  
1096
	<target name="getConversionXSL" depends="prepare"
1050
	<target name="getConversionXSL" depends="prepare,giteml"
1097 1051
		unless="styles.not.needed"
1098 1052
		description="Gets the conversion stylesheets for eml2 beta 6 to eml 2.0.0">
1099 1053

  
1100
		<svn>
1101
			<export srcUrl="${svn.eml2StyleUrl}"
1102
				destPath="${build.tmp}/conv_eml_${eml2-style-tag}" />
1103
		</svn>
1104

  
1105 1054
		<mkdir dir="lib/style/common/emlb6toeml2" />
1106 1055
		<copy todir="lib/style/common/emlb6toeml2" filtering="yes">
1107 1056
			<fileset
1108
				dir="${build.tmp}/conv_eml_${eml2-style-tag}/lib/beta6toeml2/xsl">
1057
				dir="${build.tmp}/eml_${eml2-style-tag}/lib/beta6toeml2/xsl">
1109 1058
				<include name="*.xsl" />
1110 1059
				<include name="*.xml" />
1111 1060
			</fileset>

Also available in: Unified diff