jprdonnelly/studio-se-master
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move talend.studio.tos.di.product to build sub-dir

Browse Source
This commit is contained in:
Irene Wang
2014-09-02 17:53:26 +02:00
parent 484a35f126
commit a8cd45c8bd
11 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
talend.studio.tos.di.product/.project → build/talend.studio.tos.di.product/.project
View File

0
talend.studio.tos.di.product/config.ini → build/talend.studio.tos.di.product/config.ini
View File

0
talend.studio.tos.di.product/build/launcher.ini → build/talend.studio.tos.di.product/launcher.ini
View File

0
talend.studio.tos.di.product/build/launcher_64.ini → build/talend.studio.tos.di.product/launcher_64.ini
View File

0
talend.studio.tos.di.product/build/macosx_infoplist.properties → build/talend.studio.tos.di.product/macosx_infoplist.properties
View File

44
talend.studio.tos.di.product/pom.xml → build/talend.studio.tos.di.product/pom.xml
View File

@@ -69,36 +69,6 @@
</products>
</configuration>
</plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-directory-assembly</id>
<phase>package</phase>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>${basedir}/assembly-descriptor.xml</descriptor>
<finalName>${product.short.name}-${project.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
</goals>
</execution>-->
<!--<execution>
<id>make-zip-assembly</id>
<phase>install</phase>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>${basedir}/assembly-zip-descriptor.xml</descriptor>
<finalName>${product.short.name}-${project.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -114,7 +84,7 @@
<artifactItems>
<artifactItem>
<groupId>org.talend.studio</groupId>
<artifactId>binaries</artifactId>
<artifactId>eclipse-launcher-binaries</artifactId>
<version>3.6.1</version>
<type>zip</type>
<overWrite>true</overWrite>
@@ -153,9 +123,9 @@
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
<property name="launcher.prefix"
value="TOS-DI" />
value="TOS_DI" />
<loadproperties>
<file file="${project.basedir}/build/macosx_infoplist.properties"/>
<file file="${project.basedir}/macosx_infoplist.properties"/>
</loadproperties>
<move file="${studio.dir}/launcher-macosx-cocoa.app" tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app"/>
<move todir="${studio.dir}">
@@ -171,18 +141,18 @@
from="(.*)launcher(.*)" to="\1${launcher.prefix}\2" />
</mapper>
</move>
<ac:for list="linux-gtk-ppc,solaris-gtk,solaris-gtk-x86,win32-wpf,win32-x86" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
<sequential>
<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/build/launcher.ini" />
<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher.ini" />
</sequential>
</ac:for>
<ac:for list="linux-gtk-x86_64,win-x86_64" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
<sequential>
<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/build/launcher_64.ini" />
<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher_64.ini" />
</sequential>
</ac:for>
<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/MacOS/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/build/launcher_64.ini" />
<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/MacOS/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/launcher_64.ini" />
<loadfile property="plist" srcFile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/Info.plist">
<filterchain>
<expandproperties/>

8
build/talend.studio.tos.di.product/talend.p2.inf Normal file
View File

@@ -0,0 +1,8 @@
##
# Remove root files
##
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.ini);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/artifacts.xml);

0
talend.studio.tos.di.product/talend.product → build/talend.studio.tos.di.product/talend.product
View File

2
pom.xml
View File

@@ -30,7 +30,7 @@
<profile>
<id>talend.tos.products</id>
<modules>
<module>talend.studio.tos.di.product</module>
<module>build/talend.studio.tos.di.product</module>
</modules>
</profile>
</profiles>

5
talend.studio.parent.pom/pom.xml
View File

@@ -17,7 +17,7 @@
<distributionManagement>
<repository>
<id>snapshots</id>
<id>talend_nexus_snapshots</id>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/snapshots/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
@@ -120,6 +120,9 @@
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
</plugins>

7
talend.studio.tos.di.product/talend.p2.inf
View File

@@ -1,7 +0,0 @@
##
# Remove root files
##
#instructions.configure=\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.ini);\
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);