Project

General

Profile

« Previous | Next » 

Revision 4841

Added by daigle about 15 years ago

Use only one eml common stylesheet directory for all post 2.0.0 beta versions of eml. Point all eml versions to that directory in skin xml files.

View differences:

build.xml
103 103
   	  <property name="utilities-tag"       value="UTILITIES_1_0_0" />
104 104
      <property name="eml-module"          value="eml" />
105 105
      <property name="eml-version"         value="2.0.0beta6" />
106
      <property name="eml-tag"             value="EML_2_0_0_BETA_6_FOR_METACAT" />
107
      <property name="eml2_0_0-tag"        value="RELEASE_EML_2_0_0_UPDATE_1" />
106
      <property name="eml-beta-tag"        value="BRANCH_EML_2_0_0_BETA_6_FOR_METACAT" />
107
      <property name="eml2_0_0-schema-tag" value="RELEASE_EML_2_0_0_UPDATE_1" />
108 108
      <property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
109
      <property name="eml2_0_1-style-tag"  value="RELEASE_EML_2_0_1_UPDATE_7" />
110 109
   	  <property name="eml2_1_0-schema-tag" value="RELEASE_EML_2_1_0" />
111
      <property name="eml2_1_0-style-tag"  value="RELEASE_EML_UTILS_0_9_0" />  	
110
      <property name="eml2-style-tag"      value="RELEASE_EML_UTILS_0_9_0" />  
112 111
      <property name="eml2_0_0namespace"   value="eml://ecoinformatics.org/eml-2.0.0" />
113 112
      <property name="eml2_0_1namespace"   value="eml://ecoinformatics.org/eml-2.0.1" />
114 113
      <property name="eml2_1_0namespace"   value="eml://ecoinformatics.org/eml-2.1.0" />
......
398 397
     <echo>Enter CVS password: </echo>
399 398
     <cvs cvsRoot="${cvsroot}"
400 399
          package="${eml-module}"
401
          tag="${eml-tag}"
402
          dest="${build.tmp}/eml_${eml-tag}" />
400
          tag="${eml-beta-tag}"
401
          dest="${build.tmp}/eml_${eml-beta-tag}" />
403 402
     <mkdir dir="lib/dtd" />
404 403
     <copy todir="lib/dtd" filtering="yes">
405
       <fileset dir="${build.tmp}/eml_${eml-tag}/${eml-module}">
404
       <fileset dir="${build.tmp}/eml_${eml-beta-tag}/${eml-module}">
406 405
         <include name="*.dtd"/>
407 406
       </fileset>
408 407
       <mapper type="glob" from="eml-*.dtd" to="eml-*-${eml-version}.dtd" />
409 408
     </copy>
410 409

  
411 410
     <copy todir="${style-common-cvsrelpath}" filtering="yes">
412
       <fileset dir="${build.tmp}/eml_${eml-tag}/${eml-module}/style">
411
       <fileset dir="${build.tmp}/eml_${eml-beta-tag}/${eml-module}/style">
413 412
       <include name="**/*.xsl"/>
414 413
     </fileset>
415 414
     </copy>
......
420 419
     <echo>Enter CVS password: </echo>
421 420
     <cvs cvsRoot="${cvsroot}"
422 421
          package="${eml-module}"
423
          tag="${eml2_0_0-tag}"
424
          dest="${build.tmp}/eml_${eml2_0_0-tag}" />
422
          tag="${eml2_0_0-schema-tag}"
423
          dest="${build.tmp}/eml_${eml2_0_0-schema-tag}" />
425 424
     <mkdir dir="lib/schema/eml-2.0.0" />
426 425
     <copy todir="lib/schema/eml-2.0.0" filtering="yes">
427
       <fileset dir="${build.tmp}/eml_${eml2_0_0-tag}/${eml-module}">
426
       <fileset dir="${build.tmp}/eml_${eml2_0_0-schema-tag}/${eml-module}">
428 427
         <include name="*.xsd"/>
429 428
       </fileset>
430 429

  
......
436 435

  
437 436
     </copy>
438 437
     <!-- <antcall target="copyxsl">
439
        <param name="cvs.tagname" value="${eml2_0_0-tag}" />
438
        <param name="cvs.tagname" value="${eml2_0_0-schema-tag}" />
440 439
        <param name="dirname" value="eml-2.0.0" />
441 440
     </antcall> -->
442 441
   	
......
454 453
     </copy>
455 454
   	
456 455
   	<!-- Checkout eml201 again for given style sheet tag-->
457
   	<echo>Enter CVS password: </echo>
456
   	<!-- echo>Enter CVS password: </echo>
458 457
   	     <cvs cvsRoot="${cvsroot}"
459 458
   	          package="${eml-module}"
460 459
   	          tag="${eml2_0_1-style-tag}"
......
462 461
     <antcall target="copyxsl">
463 462
        <param name="cvs.tagname" value="${eml2_0_1-style-tag}" />
464 463
        <param name="dirname" value="eml-2.0.1" />
465
     </antcall>
464
     </antcall -->
466 465
	
467 466
   	<!-- Checkout eml210 for given schema tag-->
468 467
     <echo>Enter CVS password: </echo>
......
481 480
   	<echo>Enter CVS password: </echo>
482 481
   	     <cvs cvsRoot="${cvsroot}"
483 482
   	          package="${eml-module}"
484
   	          tag="${eml2_1_0-style-tag}"
485
   	          dest="${build.tmp}/eml_${eml2_1_0-style-tag}" />
483
   	          tag="${eml2-style-tag}"
484
   	          dest="${build.tmp}/eml_${eml2-style-tag}" />
486 485
     <antcall target="copyxsl">
487
        <param name="cvs.tagname" value="${eml2_1_0-style-tag}" />
488
        <param name="dirname" value="eml-2.1.0" />
486
        <param name="cvs.tagname" value="${eml2-style-tag}" />
487
        <!-- param name="dirname" value="eml-2.1.0" / -->
488
        <param name="dirname" value="eml-2" />
489 489
     </antcall>
490 490
   </target>
491 491

  
......
607 607
	          package="${ecogrid-module}" dest="${ecogrid-module-dest-dir}"/>
608 608
   </target>  
609 609
	
610
   <target name="deploy-ecogrid" depends="clean-ecogrid-server-config-wsdd" if="enable.ecogrid" description="Automately generate wsdd for ecogrid service">
610
   <!-- target name="deploy-ecogrid" depends="clean-ecogrid-server-config-wsdd" if="enable.ecogrid" description="Automately generate wsdd for ecogrid service">
611 611
   	 <ant antfile="build.xml" dir="${ecogrid-dir}" target ="deploy" inheritall="false">
612 612
   	   	 <property name="context" value="${metacat.context}"/>
613 613
   	   	 <property name="target" value="${ecogrid-target-name}"/>
......
615 615
   	     <property name="hostname" value="${ecogrid.hostname}"/>
616 616
   	     <property name="port" value="${config.port}"/>
617 617
   	 </ant>
618
   </target>
618
   </target -->
619 619
	
620 620
   <target name="clean-ecogrid-server-config-wsdd" depends="init" description="Automately generate wsdd for ecogrid service">
621 621
      <delete file="${app.deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd"/>

Also available in: Unified diff