(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index 7ca68e01bf4b83590d2b69d3bb32fe3cc3f7de95..39fc7d075ee8da3cb316b627b57732b06724d4d7 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -20,10 +20,10 @@ is divided into following sections:
 \r
         -->\r
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="fwstk-impl">\r
-    <fail message="Please build using Ant 1.7.1 or higher.">\r
+    <fail message="Please build using Ant 1.8.0 or higher.">\r
         <condition>\r
             <not>\r
-                <antversion atleast="1.7.1"/>\r
+                <antversion atleast="1.8.0"/>\r
             </not>\r
         </condition>\r
     </fail>\r
@@ -249,6 +249,7 @@ is divided into following sections:
         </condition>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
+        <property name="copylibs.rebase" value="true"/>\r
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
     </target>\r
     <target name="-post-init">\r
@@ -430,6 +431,7 @@ is divided into following sections:
                 <property environment="env"/>\r
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>\r
                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">\r
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
                     <jvmarg line="${profiler.info.jvmargs}"/>\r
                     <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
@@ -565,7 +567,7 @@ is divided into following sections:
                     </chainedmapper>\r
                 </pathconvert>\r
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>\r
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">\r
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">\r
                     <fileset dir="${build.classes.dir}"/>\r
                     <manifest>\r
                         <attribute name="Class-Path" value="${jar.classpath}"/>\r
@@ -890,6 +892,14 @@ is divided into following sections:
             -->\r
     <target depends="init" if="have.sources" name="-javadoc-build">\r
         <mkdir dir="${dist.javadoc.dir}"/>\r
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">\r
+            <and>\r
+                <isset property="endorsed.classpath.cmd.line.arg"/>\r
+                <not>\r
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
             <classpath>\r
                 <path path="${javac.classpath}"/>\r
@@ -901,6 +911,7 @@ is divided into following sections:
                 <include name="**/*.java"/>\r
                 <exclude name="*.java"/>\r
             </fileset>\r
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>\r
         </javadoc>\r
         <copy todir="${dist.javadoc.dir}">\r
             <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">\r

diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 4731b76e4046620dff79db4c41873bbf6669707c..79533277adf13ad5dbb899e4ba8f28ad29d4ceaf 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
 nbproject/build-impl.xml.data.CRC32=1c2c8395\r
-nbproject/build-impl.xml.script.CRC32=244b17d0\r
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45\r
+nbproject/build-impl.xml.script.CRC32=daf71c18\r
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index c85e5f3f2e1a01c3d61bf97f79be5499643ed027..9a3ee7fd2c9d756230ebe1e9b7a2d7ec0912e951 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -4,4 +4,4 @@ do.depend=false
 do.jar=true\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties\r
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.1rc2\\build.properties\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index cc2c0e57c4f9286a6ee78a9b3557c26caca57415..1ee292a27eb0138a49e80b020b67b84a8cc40aaf 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>\r
+    </open-files>\r
 </project-private>\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 6f58e2ccf959a87c2cc2e84b8f22f6e15b25ccd3..1af6c7eb1749df2f5069754207d677c503f6bb97 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -1,5 +1,6 @@
 annotation.processing.enabled=true\r
 annotation.processing.enabled.in.editor=false\r
+annotation.processing.processors.list=\r
 annotation.processing.run.all.processors=true\r
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
 application.title=fwstk\r

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index b96fe7de67db22c42b37eaf065b7c8ca107083ba..e639bc5d1ae3ff885e500c44724bd78fd773f5e3 100644 (file)
--- a/fluidbook/tools/webvideo
+++ b/fluidbook/tools/webvideo
@@ -7,5 +7,7 @@ filename=${filename%.*}
 
 ulimit -t 360;/usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:04 -t 00:00:01 -f image2 $2/$filename.jpg
 ulimit -t 360;/usr/local/bin/ffmpeg -i $1 -keyint_min 0 -g 250 -skip_threshold 0 -qmin 1 -qmax 51 -vcodec libvpx -b 614400 -acodec libvorbis -y $2/$filename.webm
-ulimit -t 360;/usr/bin/ffmpeg -i $1 -y -acodec aac -ab 128k -vcodec libx264 -b 1200k -mbd 2 -cmp 2 -subcmp 2 -strict experimental $2/$filename.mp4
+if[extension!="mp4"]
+       ulimit -t 360;/usr/bin/ffmpeg -i $1 -y -acodec aac -ab 128k -vcodec libx264 -b 1200k -mbd 2 -cmp 2 -subcmp 2 -strict experimental $2/$filename.mp4
+fi
 ulimit -t 360;/usr/local/bin/ffmpeg2theora $1 -o $2/$filename.ogv
\ No newline at end of file