[Fedora-directory-commits] winsync/usersync build.bat, 1.1, 1.2 package.mak, 1.2, 1.3

Thu Nov 10 04:18:22 UTC 2005

Author: nkinder

Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync

Modified Files:
	build.bat package.mak 
Log Message:
Remove carriage returns from nmake makefiles


Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- build.bat	10 Nov 2005 00:04:42 -0000	1.1
+++ build.bat	10 Nov 2005 04:18:15 -0000	1.2
@@ -1,169 +1,169 @@
- at rem //
- at rem // BEGIN COPYRIGHT BLOCK
- at rem // This Program is free software; you can redistribute it and/or modify it under
- at rem // the terms of the GNU General Public License as published by the Free Software
- at rem // Foundation; version 2 of the License.
- at rem // 
- at rem // This Program is distributed in the hope that it will be useful, but WITHOUT
- at rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- at rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- at rem // 
- at rem // You should have received a copy of the GNU General Public License along with
- at rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- at rem // Place, Suite 330, Boston, MA 02111-1307 USA.
- at rem // 
- at rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
- at rem // right to link the code of this Program with code not covered under the GNU
- at rem // General Public License ("Non-GPL Code") and to distribute linked combinations
- at rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
- at rem // permitted under this exception must only link to the code of this Program
- at rem // through those well defined interfaces identified in the file named EXCEPTION
- at rem // found in the source code files (the "Approved Interfaces"). The files of
- at rem // Non-GPL Code may instantiate templates or use macros or inline functions from
- at rem // the Approved Interfaces without causing the resulting work to be covered by
- at rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
- at rem // additions to the list of Approved Interfaces. You must obey the GNU General
- at rem // Public License in all respects for all of the Program code and other code used
- at rem // in conjunction with the Program except the Non-GPL Code covered by this
- at rem // exception. If you modify this file, you may extend this exception to your
- at rem // version of the file, but you are not obligated to do so. If you do not wish to
- at rem // provide this exception without modification, you must delete this exception
- at rem // statement from your version and license this file solely under the GPL without
- at rem // exception. 
- at rem // 
- at rem // 
- at rem // Copyright (C) 2005 Red Hat, Inc.
- at rem // All rights reserved.
- at rem // END COPYRIGHT BLOCK
- at rem //
-
- at echo off
-
-if [%BUILD_DEBUG%] == [optimize] (
-    set FLAVOR=WINNT5.0_OPT.OBJ
-) else (
-    set FLAVOR=WINNT5.0_DBG.OBJ
-)
-
-rem ======== Set Various Build Directories ========
-set OBJDEST=..\built\%FLAVOR%
-rem   ------ Convert OBJEST to absolute ------
-call :relative %OBJDEST% OBJDEST
-
-set LIBROOT=..\components\%FLAVOR%
-rem   ------ Convert LIBROOT to absolute ------
-call :relative %LIBROOT% LIBROOT
-mkdir %LIBROOT%
-
-set PKGDIR=%OBJDEST%\package\ntds
-mkdir %PKGDIR%
-
-set DISTDIR=..\dist\%FLAVOR%
-rem   ------ Convert DISTDIR to absolute ------
-call :relative %DISTDIR% DISTDIR
-mkdir %DISTDIR%
-
-set WXSDIR=%CD%\wix
-
-rem ======== Fetch Components ========
-if [%INTERNAL_BUILD%] == [1] (
-    set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
-) else (
-    set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
-)
-
-rem   ------ ApacheDS ------
-set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
-set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
-set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
-if NOT EXIST %LIBROOT%\apacheds (
-    pushd %CD%
-    mkdir %LIBROOT%\apacheds
-    cd %LIBROOT%\apacheds
-    echo %APACHEDS_LOCATION% > version.txt
-    wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
-    unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
-    wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
-    popd
-)
-
-rem   ------ Wrapper ------
-set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
-set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
-if NOT EXIST %LIBROOT%\wrapper (
-    pushd %CD%
-    mkdir %LIBROOT%\wrapper
-    cd %LIBROOT%\wrapper
-    echo %WRAPPER_LOCATION% > version.txt
-    wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
-    unzip -q wrapper_win32_3.1.2.zip
-    popd
-)
-
-set OK=0
-
-pushd %CD%
-
-rem ======== Build ========
-rem   ------ Netman ------
-cd netman
-echo -------- Beginning Netman Build --------
-
-nmake /f netman.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
-    echo -------- Netman Build Failed! --------
-    goto :END
-) else (
-    echo -------- Netman Build Successful! --------
-)
-
-rem   ------ ApacheDS ------
-cd ..\apacheds
-echo -------- Beginning ApacheDS Build --------
-
-nmake /f apacheds.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
-    echo -------- ApacheDS Build Failed! --------
-    goto :END
-) else (
-    echo -------- ApacheDS Build Successful! --------
-)
-
-rem ======== Package ========
-cd ..
-echo -------- Beginning Packaging --------
-
-nmake /f package.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if EXIST %PKGDIR%\ntds.msi (
-    copy /Y %PKGDIR%\ntds.msi %DISTDIR%
-    set /a OK=%OK% + %ERRORLEVEL%
-)
-
-if [%OK%] GTR [1] (
-    echo -------- Packaging Failed! --------
-    goto :END
-) else (
-    echo -------- Packaging Successful! --------
-)
-
-:END
-popd
-if [%OK%] GTR [1] (
-    echo -------- Build Failed! --------
-    set OK=1
-) else (
-    echo -------- Build Successful! --------
-)
-exit %OK%
-
-:relative
-rem ======== Converts relative path to absolute path ========
-rem   ------ %1 is the path, %2 is the variable to be set ------
-set %2=%~f1
-goto :EOF
+ at rem //
+ at rem // BEGIN COPYRIGHT BLOCK
+ at rem // This Program is free software; you can redistribute it and/or modify it under
+ at rem // the terms of the GNU General Public License as published by the Free Software
+ at rem // Foundation; version 2 of the License.
+ at rem // 
+ at rem // This Program is distributed in the hope that it will be useful, but WITHOUT
+ at rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ at rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ at rem // 
+ at rem // You should have received a copy of the GNU General Public License along with
+ at rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ at rem // Place, Suite 330, Boston, MA 02111-1307 USA.
+ at rem // 
+ at rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
+ at rem // right to link the code of this Program with code not covered under the GNU
+ at rem // General Public License ("Non-GPL Code") and to distribute linked combinations
+ at rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
+ at rem // permitted under this exception must only link to the code of this Program
+ at rem // through those well defined interfaces identified in the file named EXCEPTION
+ at rem // found in the source code files (the "Approved Interfaces"). The files of
+ at rem // Non-GPL Code may instantiate templates or use macros or inline functions from
+ at rem // the Approved Interfaces without causing the resulting work to be covered by
+ at rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
+ at rem // additions to the list of Approved Interfaces. You must obey the GNU General
+ at rem // Public License in all respects for all of the Program code and other code used
+ at rem // in conjunction with the Program except the Non-GPL Code covered by this
+ at rem // exception. If you modify this file, you may extend this exception to your
+ at rem // version of the file, but you are not obligated to do so. If you do not wish to
+ at rem // provide this exception without modification, you must delete this exception
+ at rem // statement from your version and license this file solely under the GPL without
+ at rem // exception. 
+ at rem // 
+ at rem // 
+ at rem // Copyright (C) 2005 Red Hat, Inc.
+ at rem // All rights reserved.
+ at rem // END COPYRIGHT BLOCK
+ at rem //
+
+ at echo off
+
+if [%BUILD_DEBUG%] == [optimize] (
+    set FLAVOR=WINNT5.0_OPT.OBJ
+) else (
+    set FLAVOR=WINNT5.0_DBG.OBJ
+)
+
+rem ======== Set Various Build Directories ========
+set OBJDEST=..\built\%FLAVOR%
+rem   ------ Convert OBJEST to absolute ------
+call :relative %OBJDEST% OBJDEST
+
+set LIBROOT=..\components\%FLAVOR%
+rem   ------ Convert LIBROOT to absolute ------
+call :relative %LIBROOT% LIBROOT
+mkdir %LIBROOT%
+
+set PKGDIR=%OBJDEST%\package\ntds
+mkdir %PKGDIR%
+
+set DISTDIR=..\dist\%FLAVOR%
+rem   ------ Convert DISTDIR to absolute ------
+call :relative %DISTDIR% DISTDIR
+mkdir %DISTDIR%
+
+set WXSDIR=%CD%\wix
+
+rem ======== Fetch Components ========
+if [%INTERNAL_BUILD%] == [1] (
+    set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
+) else (
+    set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
+)
+
+rem   ------ ApacheDS ------
+set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
+set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
+set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
+if NOT EXIST %LIBROOT%\apacheds (
+    pushd %CD%
+    mkdir %LIBROOT%\apacheds
+    cd %LIBROOT%\apacheds
+    echo %APACHEDS_LOCATION% > version.txt
+    wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
+    unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
+    wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
+    popd
+)
+
+rem   ------ Wrapper ------
+set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
+set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
+if NOT EXIST %LIBROOT%\wrapper (
+    pushd %CD%
+    mkdir %LIBROOT%\wrapper
+    cd %LIBROOT%\wrapper
+    echo %WRAPPER_LOCATION% > version.txt
+    wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
+    unzip -q wrapper_win32_3.1.2.zip
+    popd
+)
+
+set OK=0
+
+pushd %CD%
+
+rem ======== Build ========
+rem   ------ Netman ------
+cd netman
+echo -------- Beginning Netman Build --------
+
+nmake /f netman.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+    echo -------- Netman Build Failed! --------
+    goto :END
+) else (
+    echo -------- Netman Build Successful! --------
+)
+
+rem   ------ ApacheDS ------
+cd ..\apacheds
+echo -------- Beginning ApacheDS Build --------
+
+nmake /f apacheds.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+    echo -------- ApacheDS Build Failed! --------
+    goto :END
+) else (
+    echo -------- ApacheDS Build Successful! --------
+)
+
+rem ======== Package ========
+cd ..
+echo -------- Beginning Packaging --------
+
+nmake /f package.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if EXIST %PKGDIR%\ntds.msi (
+    copy /Y %PKGDIR%\ntds.msi %DISTDIR%
+    set /a OK=%OK% + %ERRORLEVEL%
+)
+
+if [%OK%] GTR [1] (
+    echo -------- Packaging Failed! --------
+    goto :END
+) else (
+    echo -------- Packaging Successful! --------
+)
+
+:END
+popd
+if [%OK%] GTR [1] (
+    echo -------- Build Failed! --------
+    set OK=1
+) else (
+    echo -------- Build Successful! --------
+)
+exit %OK%
+
+:relative
+rem ======== Converts relative path to absolute path ========
+rem   ------ %1 is the path, %2 is the variable to be set ------
+set %2=%~f1
+goto :EOF


Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/package.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.mak	10 Nov 2005 00:36:51 -0000	1.2
+++ package.mak	10 Nov 2005 04:18:15 -0000	1.3
@@ -1,72 +1,72 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for ntds.msi
-#
-
-ALL : ntds.msi
-
-LAYOUT :
-	mkdir "$(PKGDIR)\bin"
-	copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
-	copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
-	copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
-	copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
-	copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
-	copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
-	copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
-	
-	mkdir "$(PKGDIR)\conf"
-	copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
-	copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
-
-	mkdir "$(PKGDIR)\lib"
-	copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
-	copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
-	copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
-
-	mkdir "$(PKGDIR)\logs"
-
-
-ntds.msi : LAYOUT
-	mkdir "$(PKGDIR)\Binary"
-	copy /Y wix\Binary "$(PKGDIR)\Binary"
-	cd "$(PKGDIR)"
-	candle "$(WXSDIR)\ntds.wxs"
-	light ntds.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+# 
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+# 
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
+# 
+# 
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for ntds.msi
+#
+
+ALL : ntds.msi
+
+LAYOUT :
+	mkdir "$(PKGDIR)\bin"
+	copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
+	copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
+	copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
+	copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
+	copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
+	copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
+	copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
+	
+	mkdir "$(PKGDIR)\conf"
+	copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
+	copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
+
+	mkdir "$(PKGDIR)\lib"
+	copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
+	copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
+	copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
+
+	mkdir "$(PKGDIR)\logs"
+
+
+ntds.msi : LAYOUT
+	mkdir "$(PKGDIR)\Binary"
+	copy /Y wix\Binary "$(PKGDIR)\Binary"
+	cd "$(PKGDIR)"
+	candle "$(WXSDIR)\ntds.wxs"
+	light ntds.wixobj


