View | Details | Raw Unified | Return to bug 330240 | Differences between
and this patch

Collapse All | Expand All

(-)product/pdebuild.product (-1 / +1 lines)
Lines 1-7 Link Here
1 
<?xml version="1.0" encoding="UTF-8"?>
 1 
<?xml version="1.0" encoding="UTF-8"?>
2 
<?pde version="3.5"?>
 2 
<?pde version="3.5"?>
3 

          3
          

        

          
            

              4
              
<product name="Basic Standalone PDE Build System" uid="org.eclipse.pde.build.product" application="org.eclipse.pde.build.Build" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">


              4
              
<product name="Basic Standalone PDE Build System" uid="org.eclipse.pde.build.product" application="org.eclipse.pde.build.Build" version="1.0.0.@qualifier@" useFeatures="true" includeLaunchers="true">

            

        

          5
          

          5
          

        

        

          6
          
   <configIni use="default">

          6
          
   <configIni use="default">

        

        

          7
          
   </configIni>

          7
          
   </configIni>

        



(-)buildAll.xml
      (-5 / +4 lines)




  

    
      
            Lines 520-529
          
      
      
        Link Here
      
    
  

        

          520
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/platform.sdk/platform.product" value="${buildId}" />

          520
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/platform.sdk/platform.product" value="${buildId}" />

        

        

          521
          
		<replace token="@qualifier@" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" value="${buildId}" />

          521
          
		<replace token="@qualifier@" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" value="${buildId}" />

        

        

          522
          
		<replace token="@qualifier@" file="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product" value="${buildId}" />

          522
          
		<replace token="@qualifier@" file="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product" value="${buildId}" />

        

            

              
              
              523
              
		<replace token="@qualifier@" file="${buildDirectory}/features/org.eclipse.pde.build.product.feature/product/pdebuild.product" value="${buildId}" />

            

        

          523
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp/rcp.product" value="${buildId}" />

          524
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp/rcp.product" value="${buildId}" />

        

        

          524
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.sdk/rcp.product" value="${buildId}" />

          525
          
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.sdk/rcp.product" value="${buildId}" />

        

          
            

              525
              
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.config/feature.xml" value="${buildId}" />


              526
              
		<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.config/feature.xml" value="${buildId}" />		

            

        

          526
          
		<replace token="@qualifier@" file="${equinox.build.configs}/osgistarter.config.launcher/feature.xml" value="${buildId}" />

          527
          
		<replace token="@qualifier@" file="${equinox.build.configs}/osgistarter.config.launcher/feature.xml" value="${buildId}" />

        

            

              
              
              528
              
		<replace token="@qualifier@" file="${eclipse.build.configs}/pde.build.config.launcher/feature.xml" value="${buildId}" />

            

        

          527
          
		<delete dir="${reposource}" />

          529
          
		<delete dir="${reposource}" />

        

        

          528
          
		<mkdir dir="${reposource}" />

          530
          
		<mkdir dir="${reposource}" />

        

        

          529
          
		<exec executable="unzip" dir=".">

          531
          
		<exec executable="unzip" dir=".">

        

  

    
      
            Lines 689-698
          
      
      
        Link Here
      
    
  

        

          689
          
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.osgi.configuration" launcherName="rt" config="macosx.cocoa.x86" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/rt.icns" />

          691
          
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.osgi.configuration" launcherName="rt" config="macosx.cocoa.x86" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/rt.icns" />

        

        

          690
          
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.osgi.configuration" launcherName="rt" config="macosx.cocoa.x86_64" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/rt.icns" />

          692
          
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.osgi.configuration" launcherName="rt" config="macosx.cocoa.x86_64" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/features/org.eclipse.equinox.starterkit.product.feature/rt.icns" />

        

        

          691
          

          693
          

        

          
            

              692
              
		<ant target="main" antfile="buildConfiguration.xml" dir="${eclipse.build.configs}/pde.build.config.launcher" />


              694
              
		<ant target="main" antfile="buildConfiguration.xml" dir="${eclipse.build.configs}/pde.build.config.launcher" />		

            

            

              693
              
		<property name="pde.build.starter.config.launcher.temp" value="${eclipse.build.configs}/pde.build.config.launcher/temp" />


              
              
            

            

              694
              
		<mkdir dir="${pde.build.starter.config.launcher.temp}" />


            

            

              695
              


            

        

          696
          
		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${buildDirectory}/features/org.eclipse.pde.build.product.feature/product/pdebuild.product" compress="true">

          695
          
		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${buildDirectory}/features/org.eclipse.pde.build.product.feature/product/pdebuild.product" compress="true">

        

        

          697
          
			<config os="win32" ws="win32" arch="x86" />

          696
          
			<config os="win32" ws="win32" arch="x86" />

        

        

          698
          
			<config os="win32" ws="win32" arch="x86_64" />

          697
          
			<config os="win32" ws="win32" arch="x86_64" />

        



(-)eclipse/buildConfigs/pde.build.config.launcher/buildConfiguration.xml
      (-6 / +9 lines)




  

    
      
            Lines 28-39
          
      
      
        Link Here
      
    
  

        

          28
          
			<property name="forceContextQualifier" value="${buildId}" />

          28
          
			<property name="forceContextQualifier" value="${buildId}" />

        

        

          29
          
		</ant>

          29
          
		</ant>

        

        

          30
          

          30
          

        

          
            

              31
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="win32.win32.x86" productVersion="1.0.0.${buildId}" />


              31
              
		<property name="pde.build.config.launcher.temp" value="${equinox.build.configs}/pde.build.config.launcher/temp" />

            

            

              32
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="win32.win32.x86_64" productVersion="1.0.0.${buildId}" />


              32
              
		<mkdir dir="${pde.build.config.launcher.temp}" />

            

            

              33
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="linux.gtk.x86" productVersion="1.0.0.${buildId}" />


              33
              

            

            

              34
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="linux.gtk.x86_64" productVersion="1.0.0.${buildId}" />


              34
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="win32.win32.x86" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico" />

            

            

              35
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="macosx.cocoa.x86" productVersion="1.0.0.${buildId}" />


              35
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="win32.win32.x86_64" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico" />

            

            

              36
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${osgi.starter.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="macosx.cocoa.x86_64" productVersion="1.0.0.${buildId}" />


              36
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="linux.gtk.x86" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico"  />

            

            

              
              

              37
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="linux.gtk.x86_64" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico" />

            

            


              38
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="macosx.cocoa.x86" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico"  />

            

            


              39
              
		<eclipse.brand.p2.artifacts metadataRepository="file:${reposource}" artifactRepository="file:${reposource}" tempDirectory="${pde.build.config.launcher.temp}" launcherProvider="org.eclipse.equinox.executable" productId="org.eclipse.pde.build.feature" launcherName="pdebuild" config="macosx.cocoa.x86_64" productVersion="1.0.0.${buildId}" iconsList="${buildDirectory}/org.eclipse.equinox.executable/library/win32/eclipse.ico"  />

            

        

          37
          

          40
          

        

        

          38
          
		<!-- get the generate p2.inf that got generated with the above scripts -->

          41
          
		<!-- get the generate p2.inf that got generated with the above scripts -->

        

        

          39
          
		<copy file="${basedir}/temp/features/org.eclipse.pde.build.container.feature/product/p2.inf" tofile="${basedir}/p2.inf" overwrite="true" />

          42
          
		<copy file="${basedir}/temp/features/org.eclipse.pde.build.container.feature/product/p2.inf" tofile="${basedir}/p2.inf" overwrite="true" />

        






  

  Return to bug 330240