svn commit: r534766 - in /harmony/enhanced: classlib/trunk/modules/luni/ classlib/trunk/modules/luni/src/main/native/launcher/shared/ classlib/trunk/modules/luni/src/main/native/launcher/unix/ classlib/trunk/modules/luni/src/main/native/launcher/window...

[te...@apache.org]

Author: tellison
Date: Thu May  3 02:40:33 2007
New Revision: 534766

URL: http://svn.apache.org/viewvc?view=rev&rev=534766
Log:
Moving launcher back to classlib from jdktools pending further discussion.

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/   (props changed)
      - copied from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/cmain.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/hyexelibnls.h
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/hyexelibnls.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/launcher_copyright.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/launcher_copyright.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.h
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main_hlp.h
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main_hlp.h
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/strbuf.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/strbuf.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/
      - copied from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/   (props changed)
      - copied from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/apache.ico
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/apache.ico
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/java.rc
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/java.rc
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/javaw.rc
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/javaw.rc
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/main_hlp.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/main_hlp.c
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/winmain.c
      - copied unchanged from r534006, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/winmain.c
Removed:
    harmony/enhanced/jdktools/trunk/modules/launcher/
Modified:
    harmony/enhanced/classlib/trunk/modules/luni/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=534766&r1=534765&r2=534766
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu May  3 02:40:33 2007
@@ -130,6 +130,21 @@
         <!-- Build vmls lib -->
         <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" />
 
+        <!-- Build launcher executables -->
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
+
+        <!-- Copy across the built executables -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.luni.src.main.native}/launcher">
+                <patternset includes="java${exe.suffix}" />
+                <patternset includes="javaw${exe.suffix}" />
+                <include name="*${progdb.suffix}*" if="is.windows" />
+            </fileset>
+        </copy>
+
+        <!-- Make sure the Linux launcher has execute permission -->
+        <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
+
     </target>
 
     <!-- Overlay OSS packages into their required locations -->
@@ -149,6 +164,8 @@
         <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" target="clean" />
         <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" target="clean" />
         <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
+              target="clean" />
     </target>
 
     <target name="test" depends="-test-module">

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  3 02:40:33 2007
@@ -0,0 +1 @@
+*.obj

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  3 02:40:33 2007
@@ -0,0 +1,3 @@
+*.obj
+*.RES
+*.pdb