Author: nickboldt Date: 2010-06-23 01:57:15 -0400 (Wed, 23 Jun 2010) New Revision: 22938 Added: trunk/build/util/checkCompiledArtifactVersions.sh_versionlist_JBT3.1.0.txt Modified: trunk/build/util/checkSVNArtifactVersions.sh Log: tweak checkSVNArtifactVersions.sh to improve logged output; store copy of baseline in checkCompiledArtifactVersions.sh_versionlist_JBT3.1.0.txt Added: trunk/build/util/checkCompiledArtifactVersions.sh_versionlist_JBT3.1.0.txt =================================================================== --- trunk/build/util/checkCompiledArtifactVersions.sh_versionlist_JBT3.1.0.txt (rev 0) +++ trunk/build/util/checkCompiledArtifactVersions.sh_versionlist_JBT3.1.0.txt 2010-06-23 05:57:15 UTC (rev 22938) @@ -0,0 +1,207 @@ +org_jboss_tools_common_el_ui=3.1.0 +org_jboss_tools_common_gef=3.1.0 +org_jboss_tools_common_resref_core=3.1.0 +org_jboss_tools_common_ui=3.1.0 +org_jboss_tools_common_projecttemplates=3.1.0 +org_jboss_tools_common_verification=3.1.0 +org_jboss_tools_common_model_ui=3.1.0 +org_jboss_tools_common_model=3.1.0 +org_jboss_tools_common_el_core=3.1.0 +org_jboss_tools_common_verification_ui=3.1.0 +org_jboss_tools_common_resref_ui=3.1.0 +org_jboss_tools_common=3.1.0 +org_jboss_tools_common_text_xml=3.1.0 +org_jboss_tools_common_text_ext=3.1.0 +org_jboss_tools_flow_common_source_feature=4.0.0 +org_jboss_tools_flow_jpdl4_feature=4.0.0 +org_jboss_tools_flow_common_feature=4.0.0 +org_jboss_tools_flow_jpdl4_source_feature=4.0.0 +org_jboss_tools_flow_jpdl4_multipage=4.3.0 +org_jboss_tools_flow_common=4.0.0 +org_jboss_tools_flow_jpdl4_multipage_source=4.3.0 +org_jboss_tools_flow_jpdl4=4.3.0 +org_jboss_tools_flow_jpdl4_source=4.3.0 +org_jboss_tools_flow_common_source=4.0.0 +org_jbpm_gd_jpdl_feature=3.2.0 +org_jbpm_gd_jpdl_source_feature=3.2.0 +org_jboss_tools_jbpm_convert_feature=1.1.0 +org_jboss_tools_jbpm4_sdk_feature=4.3.0 +org_jboss_tools_jbpm_common_feature=4.3.0 +org_jboss_tools_jbpm_common_source_feature=4.3.0 +org_jboss_tools_jbpm3_sdk_feature=3.2.0 +org_jboss_tools_jbpm4_feature=4.0.0 +org_jbpm_gd_jpdl=3.2.0 +org_jboss_tools_jbpm_common=4.3.0 +org_jboss_tools_jbpm_convert=1.1.0 +org_jbpm_gd_jpdl_source=3.2.0 +org_jboss_tools_jbpm_common_source=4.3.0 +org_jboss_tools_jmx_sdk_feature=1.1.0 +org_jboss_tools_jmx_feature=1.1.0 +org_jboss_tools_jmx_source_feature=1.1.0 +org_jboss_tools_jmx_source_feature=1.1.0 +org_jboss_tools_jmx_ui=1.1.0 +org_jboss_tools_jmx_core=1.1.0 +org_jboss_ide_eclipse_archives_feature=3.1.0 +org_jboss_ide_eclipse_archives_webtools=2.1.0 +org_jboss_ide_eclipse_archives_ui=3.1.0 +org_jboss_ide_eclipse_archives_jdt_integration=3.1.0 +org_jboss_ide_eclipse_archives_core=3.1.0 +org_jboss_ide_eclipse_as_feature=2.1.0 +org_jboss_tools_eclipse_as_tptp=1.1.0 +org_jboss_ide_eclipse_as_wtp_ui=2.1.0 +org_jboss_ide_eclipse_as_classpath_core=2.1.0 +org_jboss_ide_eclipse_as_ui=2.1.0 +org_jboss_ide_eclipse_as_wtp_core=2.1.0 +org_jboss_ide_eclipse_as_ssh=2.1.0 +org_jboss_ide_eclipse_as_core=2.1.0 +org_jboss_ide_eclipse_as_ui_mbeans=2.1.0 +org_jboss_ide_eclipse_as_classpath_ui=2.1.0 +org_jboss_tools_bpel_sdk_feature=1.0.0 +org_jboss_tools_bpel_source_feature=1.0.0 +org_jboss_tools_bpel_feature=1.0.0 +org_eclipse_bpel_apache_ode_deploy_model_source=0.5.0 +org_eclipse_bpel_common_ui_source=0.5.0 +org_eclipse_bpel_wsil_model=0.5.0 +org_eclipse_bpel_common_ui=0.5.0 +org_eclipse_bpel_validator=0.5.0 +org_eclipse_bpel_ui=0.5.0 +org_eclipse_bpel_apache_ode_deploy_ui_source=0.5.0 +org_jboss_tools_bpel_cheatsheet_source=1.0.0 +org_eclipse_bpel_xpath10_source=0.5.0 +org_eclipse_bpel_common_model_source=0.5.0 +org_eclipse_bpel_apache_ode_deploy_model=0.5.0 +org_eclipse_bpel_model_source=0.5.0 +org_eclipse_bpel_wsil_model_source=0.5.0 +org_jboss_tools_bpel_runtimes=0.4.0 +org_eclipse_bpel_model=0.5.0 +org_eclipse_bpel_validator_source=0.5.0 +org_eclipse_bpel_common_model=0.5.0 +org_eclipse_bpel_xpath10=0.5.0 +org_jboss_tools_bpel_cheatsheet=1.0.0 +org_jboss_tools_bpel_runtimes_source=0.4.0 +org_eclipse_bpel_ui_source=0.5.0 +org_eclipse_bpel_apache_ode_deploy_ui=0.5.0 +org_jboss_tools_smooks_feature=1.1.0 +org_jboss_tools_smooks_core=1.1.0 +org_jboss_tools_smooks_templating=1.1.0 +org_jboss_tools_smooks_ui=1.1.0 +org_jboss_tools_smooks_runtime=1.1.0 +org_jboss_ide_eclipse_freemarker_sdk_feature=1.1.0 +org_jboss_ide_eclipse_freemarker_source_feature=1.1.0 +org_jboss_ide_eclipse_freemarker_feature=1.1.0 +org_jboss_ide_eclipse_freemarker_source_feature=1.1.0 +org_jboss_ide_eclipse_freemarker=1.1.0 +org_jboss_tools_portlet_feature=1.1.0 +org_jboss_tools_portlet_core=1.1.0 +org_jboss_tools_portlet_ui=1.1.0 +org_jboss_tools_xulrunner_feature=1.9.1 +org_mozilla_xulrunner_gtk_linux_x86=64_1. +org_mozilla_xulrunner_cocoa_macosx=1.9.1 +org_jboss_tools_xulrunner=1.1.0 +org_jboss_tools_xulrunner_initializer=1.1.0 +org_mozilla_xulrunner_carbon_macosx=1.9.1 +org_mozilla_xulrunner_win32_win32_x86=1.9.1 +org_mozilla_xulrunner_gtk_linux_x86=1.9.1 +org_jboss_tools_vpe_xulrunner=3.1.0 +org_jboss_tools_jst_web_kb=3.1.0 +org_jboss_tools_jst_web_ui=3.1.0 +org_jboss_tools_jst_css=3.1.0 +org_jboss_tools_jst_text_ext=3.1.0 +org_jboss_tools_jst_web_tiles_ui=3.1.0 +org_jboss_tools_jst_firstrun=3.1.0 +org_jboss_tools_jst_web=3.1.0 +org_jboss_tools_jst_web_tiles=3.1.0 +org_jboss_tools_jsf_vpe_jstl=3.1.0 +org_jboss_tools_jst_jsp=3.1.0 +org_jboss_tools_jst_web_verification=3.1.0 +org_jboss_tools_vpe_ui_palette=3.1.0 +org_jboss_tools_struts_vpe_struts=3.1.0 +org_jboss_tools_jsf_vpe_myfaces=3.1.0 +org_jboss_tools_vpe_html=3.1.0 +org_jboss_tools_vpe_jsp=3.1.0 +org_jboss_tools_jsf_vpe_richfaces=3.1.0 +org_jboss_tools_vpe=3.1.0 +org_jboss_tools_jsf_vpe_jstl=3.1.0 +org_jboss_tools_jsf_vpe_facelets=3.1.0 +org_jboss_tools_jsf_vpe_jsf=3.1.0 +org_jboss_tools_jsf_vpe_ajax4jsf=3.1.0 +org_jboss_tools_vpe_resref=3.1.0 +org_jboss_tools_vpe_xulrunner=3.1.0 +org_jboss_tools_vpe_docbook=3.1.0 +org_jboss_tools_jsf_vpe_seam=3.1.0 +org_jboss_tools_jsf_text_ext=3.1.0 +org_jboss_tools_jsf_vpe_myfaces=3.1.0 +org_jboss_tools_jsf=3.1.0 +org_jboss_tools_jsf_verification=3.1.0 +org_jboss_tools_jsf_vpe_richfaces=3.1.0 +org_jboss_tools_jsf_vpe_jstl=3.1.0 +org_jboss_tools_jsf_text_ext_facelets=3.1.0 +org_jboss_tools_jsf_ui=3.1.0 +org_jboss_tools_jsf_vpe_facelets=3.1.0 +org_jboss_tools_jsf_text_ext_richfaces=3.1.0 +org_jboss_tools_jsf_vpe_jsf=3.1.0 +org_jboss_tools_jsf_vpe_ajax4jsf=3.1.0 +org_jboss_tools_jsf_vpe_seam=3.1.0 +org_drools_eclipse_task_feature=5.1.0 +org_drools_eclipse_feature=5.1.0 +org_drools_eclipse_task=5.1.0 +org_drools_eclipse=5.1.0 +org_jboss_tools_esb_feature=1.3.0 +org_jboss_tools_esb_project_ui=1.3.0 +org_jboss_tools_esb_project_core=1.3.0 +org_jboss_tools_esb_core=1.3.0 +org_jboss_tools_esb_ui=1.3.0 +org_jboss_tools_tptp_feature=1.1.0 +org_jboss_tools_eclipse_as_tptp=1.1.0 +org_jboss_tools_ws_feature=1.1.0 +org_eclipse_bpel_wsil_model=0.5.0 +org_jboss_tools_ws_ui=1.1.0 +org_jboss_tools_ws_creation_ui=1.1.0 +org_jboss_tools_ws_creation_core=1.1.0 +org_eclipse_bpel_wsil_model_source=0.5.0 +org_jboss_tools_ws_core=1.1.0 +org_jboss_tools_cdi_feature=1.0.0 +org_jboss_tools_cdi_xml_ui=1.0.0 +org_jboss_tools_cdi_xml=1.0.0 +org_jboss_tools_cdi_core=1.0.0 +org_jboss_tools_cdi_text_ext=1.0.0 +org_jboss_tools_cdi_ui=1.0.0 +org_jboss_tools_struts=featu +org_jboss_tools_struts_vpe_struts=3.1.0 +org_jboss_tools_struts_verification=3.1.0 +org_jboss_tools_struts=3.1.0 +org_jboss_tools_struts_validator_ui=3.1.0 +org_jboss_tools_struts_text_ext=3.1.0 +org_jboss_tools_struts_ui=3.1.0 +org_jboss_tools_maven_seam_source_feature=1.0.0 +org_jboss_tools_seam_feature=3.1.0 +org_jboss_tools_maven_seam_feature=1.0.0 +org_jboss_tools_seam_xml_ui=3.1.0 +org_jboss_tools_seam_xml=3.1.0 +org_jboss_tools_seam_text_ext=3.1.0 +org_jboss_tools_seam_ui=3.1.0 +org_jboss_tools_seam_ui_pages=3.1.0 +org_jboss_tools_maven_seam=1.0.0 +org_jboss_tools_seam_core=3.1.0 +org_jboss_tools_seam_pages_xml=3.1.0 +org_jboss_tools_maven_seam_source_feature=1.0.0 +org_jboss_tools_jsf_vpe_seam=3.1.0 +org_jboss_tools_project_examples_feature=1.1.0 +org_jboss_tools_community_project_examples_feature=1.0.0 +org_jboss_tools_project_examples=1.1.0 +org_jboss_tools_community_project_examples=1.0.0 +org_jboss_tools_project_examples_cheatsheet=1.1.0 +org_jboss_tools_birt_feature=1.1.0 +org_jboss_tools_birt_oda_ui=1.1.0 +org_jboss_tools_birt_core=1.1.0 +org_jboss_tools_birt_oda=1.1.0 +org_jboss_tools_maven_source_feature=1.0.0 +org_jboss_tools_maven_sdk_feature=1.0.0 +org_jboss_tools_maven_seam_source_feature=1.0.0 +org_jboss_tools_maven_seam_feature=1.0.0 +org_jboss_tools_maven_feature=1.0.0 +org_jboss_tools_maven_ui=1.0.0 +org_jboss_tools_maven_source_feature=1.0.0 +org_jboss_tools_maven_seam=1.0.0 +org_jboss_tools_maven_seam_source_feature=1.0.0 +org_jboss_tools_maven_core=1.0.0 Modified: trunk/build/util/checkSVNArtifactVersions.sh =================================================================== --- trunk/build/util/checkSVNArtifactVersions.sh 2010-06-23 05:33:10 UTC (rev 22937) +++ trunk/build/util/checkSVNArtifactVersions.sh 2010-06-23 05:57:15 UTC (rev 22938) @@ -38,52 +38,57 @@ fi done echo "Found $features features and $plugins plugins to check." -echo "" . ${versionlist} for f in $dirs; do if [[ -f ${basedir}${f}/META-INF/MANIFEST.MF ]] || [[ -f ${basedir}${f}/feature.xml ]]; then - #echo ${f}; - if [[ -f ${basedir}${f}/META-INF/MANIFEST.MF ]]; then - dos2unix -q ${basedir}${f}/META-INF/MANIFEST.MF - #svn diff --new=${newsvnbasedir}${f}/META-INF/MANIFEST.MF --old=${oldsvnbasedir}${f}/META-INF/MANIFEST.MF | grep Bundle-Version - v=$(cat ${basedir}${f}/META-INF/MANIFEST.MF | grep Bundle-Version | perl -pe "s#Bundle-Version: ##g"); v=${v:0:5} + echo "" + echo "== ${basedir}${f} =="; + echo "" + if [[ -f ${basedir}${f}/feature.xml ]]; then + dos2unix -q ${basedir}${f}/feature.xml + v=$(head -16 ${basedir}${f}/feature.xml | grep -v "<?xml" | grep -v "version=\"0.0.0\"" | grep "version=" | head -1 | tr -d "a-zA-Z=\"> "); v=${v%.}; a=${f##*/} # org.jboss.tools.maven.seam.feature b=${a//./_} # org_jboss_tools_maven_seam_feature - if [[ ${!b} ]] && [[ "${!b}" != "$v" ]]; then - echo " - ${!b} :: $a" - echo " + $v :: $a" - elif [[ ! ${!b} ]]; then - if [[ $(echo $a | grep test) ]]; then - echo "T+ $v :: $a" | grep test - else - echo "P+ $v :: $a" - fi + + echo "diff svn artifact:" + svn diff --summarize --new=${newsvnbasedir}${f} --old=${oldsvnbasedir}${f} | perl -pe "s#${oldsvnbasedir}${f}#${a}#g" + echo "" + + echo "diff svn manifest:" + svn diff --new=${newsvnbasedir}${f}/feature.xml --old=${oldsvnbasedir}${f}/feature.xml | grep -v "<?xml" | grep -v "version=\"0.0.0\"" | grep "version=" + echo "" + + echo "diff rel baseline:" + if [[ ${!b} ]]; then + echo "- ${!b} :: $a" else - echo "== $v :: $a" + echo "- ?.?.? :: $a" fi - fi - if [[ -f ${basedir}${f}/feature.xml ]]; then - #svn diff --new=${newsvnbasedir}${f}/feature.xml --old=${oldsvnbasedir}${f}/feature.xml | grep -v "<?xml" | grep -v "version=\"0.0.0\"" | grep "version=" - dos2unix -q ${basedir}${f}/feature.xml - v=$(head -16 ${basedir}${f}/feature.xml | grep -v "<?xml" | grep -v "version=\"0.0.0\"" | grep "version=" | head -1 | tr -d "a-zA-Z=\"> "); v=${v%.}; - a=${f##*/} + echo "+ $v :: $a" + elif [[ -f ${basedir}${f}/META-INF/MANIFEST.MF ]]; then + dos2unix -q ${basedir}${f}/META-INF/MANIFEST.MF + v=$(cat ${basedir}${f}/META-INF/MANIFEST.MF | grep Bundle-Version | perl -pe "s#Bundle-Version: ##g"); v=${v:0:5} + a=${f##*/} # org.jboss.tools.maven.seam.feature b=${a//./_} # org_jboss_tools_maven_seam_feature - if [[ ${!b} ]] && [[ "${!b}" != "$v" ]]; then - echo " - ${!b} :: $a" - echo " + $v :: $a" - elif [[ ! ${!b} ]]; then - if [[ $(echo $a | grep test) ]]; then - echo "T+ $v :: $a" | grep test - else - echo "F+ $v :: $a" - fi + + echo "diff svn artifact:" + svn diff --summarize --new=${newsvnbasedir}${f} --old=${oldsvnbasedir}${f} | perl -pe "s#${oldsvnbasedir}${f}#${a}#g" + echo "" + + echo "diff svn manifest:" + svn diff --new=${newsvnbasedir}${f}/META-INF/MANIFEST.MF --old=${oldsvnbasedir}${f}/META-INF/MANIFEST.MF | grep Bundle-Version + echo "" + + echo "diff rel baseline:" + if [[ ${!b} ]]; then + echo "- ${!b} :: $a" else - echo "== $v :: $a" + echo "- ?.?.? :: $a" fi + echo "+ $v :: $a" fi - #echo "" fi done