equal
deleted
inserted
replaced
88 the wiki to interpret the text verbatim |
88 the wiki to interpret the text verbatim |
89 - nwiki.domain is typically nwiki.nokia.com |
89 - nwiki.domain is typically nwiki.nokia.com |
90 - location could be, MBPVancouver for example |
90 - location could be, MBPVancouver for example |
91 --> |
91 --> |
92 <target name="create-wiki-bom" depends="remove-build-version-dots,get-nwiki-username,get-nwiki-password" if="publish"> |
92 <target name="create-wiki-bom" depends="remove-build-version-dots,get-nwiki-username,get-nwiki-password" if="publish"> |
93 <loadfile property="temp-bom-data" srcfile="${build.log.dir}/${build.name}_${build.version}_BOM.txt" failonerror="false"> |
93 <loadfile property="temp-bom-data" srcfile="${prep.log.dir}/${build.name}_${build.version}_BOM.txt" failonerror="false"> |
94 </loadfile> |
94 </loadfile> |
95 <if> |
95 <if> |
96 <isset property="temp-bom-data" /> |
96 <isset property="temp-bom-data" /> |
97 <then> |
97 <then> |
98 <hlm:nwikiCreatePageMacro username="${nwiki.username}" password="${nwiki.password}" domain="${nwiki.domain}" location="${nwiki.location}" nwiki-formatted-data="<pre>${temp-bom-data}</pre>" page-name="${build.name}_${wiki.build.version}_BOM" /> |
98 <hlm:nwikiCreatePageMacro username="${nwiki.username}" password="${nwiki.password}" domain="${nwiki.domain}" location="${nwiki.location}" nwiki-formatted-data="<pre>${temp-bom-data}</pre>" page-name="${build.name}_${wiki.build.version}_BOM" /> |
107 the wiki to interpret the text verbatim |
107 the wiki to interpret the text verbatim |
108 - nwiki.domain is typically nwiki.nokia.com |
108 - nwiki.domain is typically nwiki.nokia.com |
109 - location could be, MBPVancouver for example |
109 - location could be, MBPVancouver for example |
110 --> |
110 --> |
111 <target name="create-wiki-bom-delta" depends="remove-build-version-dots,get-nwiki-username,get-nwiki-password" if="publish"> |
111 <target name="create-wiki-bom-delta" depends="remove-build-version-dots,get-nwiki-username,get-nwiki-password" if="publish"> |
112 <loadfile property="temp-bom-delta-data" srcfile="${build.log.dir}/${build.name}_${build.version}_BOM_delta.txt" failonerror="false"> |
112 <loadfile property="temp-bom-delta-data" srcfile="${prep.log.dir}/${build.name}_${build.version}_BOM_delta.txt" failonerror="false"> |
113 </loadfile> |
113 </loadfile> |
114 |
114 |
115 <if> |
115 <if> |
116 <isset property="temp-bom-delta-data" /> |
116 <isset property="temp-bom-delta-data" /> |
117 <then> |
117 <then> |
121 </target> |
121 </target> |
122 |
122 |
123 <!-- Retrieve the NWiki password from the .netrc file and store it into nwiki.password property. --> |
123 <!-- Retrieve the NWiki password from the .netrc file and store it into nwiki.password property. --> |
124 <target name="get-nwiki-password"> |
124 <target name="get-nwiki-password"> |
125 <hlm:netrcPasswordMacro output-prop="nwiki.password" result-prop="nwiki.password.available" type="nwiki" /> |
125 <hlm:netrcPasswordMacro output-prop="nwiki.password" result-prop="nwiki.password.available" type="nwiki" /> |
|
126 <hlm:logreplace regexp="${nwiki.password}"/> |
126 </target> |
127 </target> |
127 |
128 |
128 <!-- Retrieve the NWiki username from the .netrc file and store it into nwiki.username property. --> |
129 <!-- Retrieve the NWiki username from the .netrc file and store it into nwiki.username property. --> |
129 <target name="get-nwiki-username"> |
130 <target name="get-nwiki-username"> |
130 <hlm:netrcUsernameMacro output-prop="nwiki.username" result-prop="nwiki.username.available" type="nwiki" /> |
131 <hlm:netrcUsernameMacro output-prop="nwiki.username" result-prop="nwiki.username.available" type="nwiki" /> |