[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/setsdkenv_windows.template solenv/bin

[Jürgen Schmidt]

 odk/setsdkenv_windows.template |   20 ++++++++++++++++++++
 solenv/bin/srcrelease.xml      |    8 +++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 5d0489240834e9e3c2d860518c1f6e5803f7591d
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Jun 10 14:42:09 2013 +0000

    #122504# rename src release sfile name to from aoo-... to apache-openoffice-...

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 2d57082..3540cda 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -25,7 +25,8 @@
   <property name="getrevision.script" value="${env.SOLARENV}/bin/getrevision.pl"/>
 
   <property name="out.dir" value="."/>
-  <property name="aoo.name" value="aoo"/>
+  <property name="aoo.name" value="apache-openoffice"/>
+  <property name="aoo.short.name" value="aoo"/>
   <property name="aoo.ver" value="4.0.0"/>
 
   <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
@@ -41,8 +42,9 @@
   </target>
 
   <target name="declarenames" depends="getrevision">
-    <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
-    <property name="release.file.name" value="${release.dir.name}-r${scm.revision}-src"/>
+    <property name="release.dir.name" value="${aoo.short.name}-${aoo.ver}"/>
+    <property name="release.name" value="${aoo.name}-${aoo.ver}"/>
+    <property name="release.file.name" value="${release.name}-r${scm.revision}-src"/>
     <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
     <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
     <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
commit 8810e06850ee218d4b3059aa33b5058dfcab853c
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Jun 10 14:05:20 2013 +0000

    #122477# add missing license header

diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index cc5e7c4..631d9c9 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,3 +1,23 @@
+rem *************************************************************
+rem  
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements.  See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership.  The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License.  You may obtain a copy of the License at
+rem  
+rem    http://www.apache.org/licenses/LICENSE-2.0
+rem  
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied.  See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+rem  
+rem *************************************************************
 @echo off
 REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.