Subversion Repositories DevTools

Rev

Rev 1978 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1978 Rev 4885
Line 59... Line 59...
59 
                <then>
 59 
                <then>
60 
                    <echo taskname="using" level="verbose">@{name} has already been defined. Skipping import...</echo>
 60 
                    <echo taskname="using" level="verbose">@{name} has already been defined. Skipping import...</echo>
61 
                </then>
 61 
                </then>
62 
                <else>
 62 
                <else>
63 
                    <if>
 63 
                    <if>
64 
                        <not>
 - 
 
65 
                            <isset property="manifest.prepared" />
 - 
 
66 
                        </not>
 - 
 
67 
                        <then>
 - 
 
68 
                            <delete file="${basedir}/build/pkg/descpkg" quiet="true" />
 - 
 
69 
                            <property name="manifest.prepared" value="true" />
 - 
 
70 
                        </then>
 - 
 
71 
                    </if>
 - 
 
72 
 
 - 
 
73 
                    <if>
 - 
 
74 
                        <and>
 64 
                        <and>
75 
                            <equals arg1="@{copy}" arg2="true" />
 65 
                            <equals arg1="@{copy}" arg2="true" />
76 
        					<isset property="env.GBE_DPKG_CACHE"/>
 66 
        					<isset property="env.GBE_DPKG_CACHE"/>
77 
                            <length string="${env.GBE_DPKG_CACHE}" trim="true" when="greater" length="0"/>
 67 
                            <length string="${env.GBE_DPKG_CACHE}" trim="true" when="greater" length="0"/>
78 
                        </and>
 68 
                        </and>
Line 84... Line 74...
84 
                            <property name="using.@{refid}.basedir" value="@{from}/@{name}/@{version}" />
 74 
                            <property name="using.@{refid}.basedir" value="@{from}/@{name}/@{version}" />
85 
                        </else>
 75 
                        </else>
86 
                    </if>
 76 
                    </if>
87 
 
 77 
 
88 
                    <mkdir dir="${basedir}/build/pkg" />
 78 
                    <mkdir dir="${basedir}/build/pkg" />
89 
                    <!--<manifest file="${basedir}/build/pkg/descpkg" mode="update">
 - 
 
90 
						<section name="Build Dependencies">
 - 
 
91 
							<attribute name="@{name}" value="@{version}"/>
 - 
 
92 
						</section>
 - 
 
93 
					</manifest>
 - 
 
94 
					-->
 - 
 
95 
 
 79 
 
96 
                    <echo taskname="using">@{name} version @{version}</echo>
 80 
                    <echo taskname="using">@{name} version @{version}</echo>
97 
                    <if>
 81 
                    <if>
98 
                        <and>
 82 
                        <and>
99 
                            <equals arg1="@{copy}" arg2="true" />
 83 
                            <equals arg1="@{copy}" arg2="true" />
Line 106... Line 90...
106 
                        </and>
 90 
                        </and>
107 
                        <then>
 91 
                        <then>
108 
                            <mkdir dir="${using.@{refid}.basedir}" />
 92 
                            <mkdir dir="${using.@{refid}.basedir}" />
109 
                            <copy todir="${using.@{refid}.basedir}" verbose="yes">
 93 
                            <copy todir="${using.@{refid}.basedir}" verbose="yes">
110 
                                <fileset dir="@{from}/@{name}/@{version}" includes="@{includes}">
 94 
                                <fileset dir="@{from}/@{name}/@{version}" includes="@{includes}">
111 
                                    <exclude name="descpkg" />
 - 
 
112 
                                    <!--patternset refid="@{name}.patternset-libraries"/-->
 - 
 
113 
                                    <using-fileset />
 95 
                                    <using-fileset />
114 
                                </fileset>
 96 
                                </fileset>
115 
                            </copy>
 97 
                            </copy>
116 
                        </then>
 98 
                        </then>
117 
                        <else>
 99 
                        <else>