mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Removed JDK info from build.xml.
This commit is contained in:
Winston Li
parent
5c2e461b2b
commit
af39d0d8d0
4 changed files with 28 additions and 81 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AntConfiguration">
|
||||
<buildFile url="file://$PROJECT_DIR$/writelatex-git-bridge.xml" />
|
||||
<buildFile url="file://$PROJECT_DIR$/build.xml" />
|
||||
</component>
|
||||
</project>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="0c822a5a-f421-4f3c-b941-5c2809c4546f" name="Default" comment="">
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/build.xml" afterPath="" />
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/writelatex-git-bridge.properties" afterPath="" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" afterPath="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/ant.xml" afterPath="$PROJECT_DIR$/.idea/ant.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/writelatex-git-bridge.iml" afterPath="$PROJECT_DIR$/writelatex-git-bridge.iml" />
|
||||
</list>
|
||||
<ignored path="writelatex-git-bridge.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
|
|
@ -50,21 +48,21 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="WLGitBridgeServerTests.java" pinned="false" current="true" current-in-tab="true">
|
||||
<file leaf-file-name="WLGitBridgeServerTests.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.26439482" vertical-offset="0" max-vertical-offset="851">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
||||
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="writelatex-git-bridge.xml" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
|
||||
<file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/build.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-19.692308" vertical-offset="3463" max-vertical-offset="4305">
|
||||
<caret line="265" column="45" selection-start-line="265" selection-start-column="45" selection-end-line="265" selection-end-column="45" />
|
||||
<state vertical-scroll-proportion="3.6181817" vertical-offset="525" max-vertical-offset="3720">
|
||||
<caret line="234" column="16" selection-start-line="234" selection-start-column="16" selection-end-line="234" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -80,16 +78,6 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="WLReceivePackFactoryTests.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="315">
|
||||
<caret line="7" column="40" selection-start-line="7" selection-start-column="40" selection-end-line="13" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="WLRepositoryResolverTests.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLRepositoryResolverTests.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
|
@ -176,10 +164,10 @@
|
|||
<option value="$PROJECT_DIR$/test/uk/ac/ic/test/MainTests.java" />
|
||||
<option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/MainTests.java" />
|
||||
<option value="$PROJECT_DIR$/writelatex-git-bridge.properties" />
|
||||
<option value="$PROJECT_DIR$/build.xml" />
|
||||
<option value="$PROJECT_DIR$/writelatex-git-bridge.iml" />
|
||||
<option value="$PROJECT_DIR$/writelatex-git-bridge.xml" />
|
||||
<option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" />
|
||||
<option value="$PROJECT_DIR$/build.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -624,7 +612,7 @@
|
|||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="2" y="23" width="2559" height="1413" extended-state="6" />
|
||||
<editor active="false" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
|
|
@ -636,13 +624,13 @@
|
|||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13325518" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13325518" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16443452" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="100" y="123" width="1166" height="541" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
|
|
@ -674,7 +662,7 @@
|
|||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
<option name="FILTER_TARGETS" value="false" />
|
||||
<buildFile url="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
|
||||
<buildFile url="file://$PROJECT_DIR$/build.xml">
|
||||
<expanded value="true" />
|
||||
</buildFile>
|
||||
</component>
|
||||
|
|
@ -1037,14 +1025,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="-19.692308" vertical-offset="3463" max-vertical-offset="4305">
|
||||
<caret line="265" column="45" selection-start-line="265" selection-start-column="45" selection-end-line="265" selection-end-column="45" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
|
||||
|
|
@ -1055,12 +1035,20 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.26439482" vertical-offset="0" max-vertical-offset="851">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
|
||||
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/build.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="3.6181817" vertical-offset="525" max-vertical-offset="3720">
|
||||
<caret line="234" column="16" selection-start-line="234" selection-start-column="16" selection-end-line="234" selection-end-column="16" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<project name="writelatex-git-bridge" default="all">
|
||||
|
||||
|
||||
<property file="writelatex-git-bridge.properties"/>
|
||||
<!-- Uncomment the following property if no tests compilation is needed -->
|
||||
<!--
|
||||
<property name="skip.tests" value="true"/>
|
||||
|
|
@ -56,41 +55,7 @@
|
|||
<exclude name="**/?*.clj"/>
|
||||
</patternset>
|
||||
|
||||
<!-- JDK definitions -->
|
||||
|
||||
<property name="jdk.bin.1.7" value="${jdk.home.1.7}/bin"/>
|
||||
<path id="jdk.classpath.1.7">
|
||||
<fileset dir="${jdk.home.1.7}">
|
||||
<include name="lib/ant-javafx.jar"/>
|
||||
<include name="lib/dt.jar"/>
|
||||
<include name="lib/javafx-doclet.jar"/>
|
||||
<include name="lib/javafx-mx.jar"/>
|
||||
<include name="lib/jconsole.jar"/>
|
||||
<include name="lib/sa-jdi.jar"/>
|
||||
<include name="lib/tools.jar"/>
|
||||
<include name="jre/lib/charsets.jar"/>
|
||||
<include name="jre/lib/deploy.jar"/>
|
||||
<include name="jre/lib/htmlconverter.jar"/>
|
||||
<include name="jre/lib/javaws.jar"/>
|
||||
<include name="jre/lib/jce.jar"/>
|
||||
<include name="jre/lib/jfr.jar"/>
|
||||
<include name="jre/lib/jfxrt.jar"/>
|
||||
<include name="jre/lib/jsse.jar"/>
|
||||
<include name="jre/lib/management-agent.jar"/>
|
||||
<include name="jre/lib/plugin.jar"/>
|
||||
<include name="jre/lib/resources.jar"/>
|
||||
<include name="jre/lib/rt.jar"/>
|
||||
<include name="jre/lib/ext/dnsns.jar"/>
|
||||
<include name="jre/lib/ext/localedata.jar"/>
|
||||
<include name="jre/lib/ext/sunec.jar"/>
|
||||
<include name="jre/lib/ext/sunjce_provider.jar"/>
|
||||
<include name="jre/lib/ext/sunpkcs11.jar"/>
|
||||
<include name="jre/lib/ext/zipfs.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<property name="project.jdk.home" value="${jdk.home.1.7}"/>
|
||||
<property name="project.jdk.bin" value="${jdk.bin.1.7}"/>
|
||||
<property name="project.jdk.classpath" value="jdk.classpath.1.7"/>
|
||||
|
||||
|
||||
|
|
@ -132,8 +97,6 @@
|
|||
<dirname property="module.writelatex-git-bridge.basedir" file="${ant.file}"/>
|
||||
|
||||
|
||||
<property name="module.jdk.home.writelatex-git-bridge" value="${project.jdk.home}"/>
|
||||
<property name="module.jdk.bin.writelatex-git-bridge" value="${project.jdk.bin}"/>
|
||||
<property name="module.jdk.classpath.writelatex-git-bridge" value="${project.jdk.classpath}"/>
|
||||
|
||||
<property name="compiler.args.writelatex-git-bridge" value="-encoding UTF-8 -source 1.6 ${compiler.args}"/>
|
||||
|
|
@ -146,7 +109,6 @@
|
|||
</path>
|
||||
|
||||
<path id="writelatex-git-bridge.module.production.classpath">
|
||||
<path refid="${module.jdk.classpath.writelatex-git-bridge}"/>
|
||||
<path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
|
||||
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
|
||||
<path refid="library.javax.servlet-api-3.1.0.classpath"/>
|
||||
|
|
@ -168,7 +130,6 @@
|
|||
</path>
|
||||
|
||||
<path id="writelatex-git-bridge.module.classpath">
|
||||
<path refid="${module.jdk.classpath.writelatex-git-bridge}"/>
|
||||
<pathelement location="${writelatex-git-bridge.output.dir}"/>
|
||||
<path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
|
||||
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
|
||||
|
|
@ -217,7 +178,7 @@
|
|||
|
||||
<target name="compile.module.writelatex-git-bridge.production" description="Compile module writelatex-git-bridge; production classes">
|
||||
<mkdir dir="${writelatex-git-bridge.output.dir}"/>
|
||||
<javac destdir="${writelatex-git-bridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac">
|
||||
<javac destdir="${writelatex-git-bridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
|
||||
<compilerarg line="${compiler.args.writelatex-git-bridge}"/>
|
||||
<bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
|
||||
<classpath refid="writelatex-git-bridge.module.production.classpath"/>
|
||||
|
|
@ -235,7 +196,7 @@
|
|||
|
||||
<target name="compile.module.writelatex-git-bridge.tests" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
|
||||
<mkdir dir="${writelatex-git-bridge.testoutput.dir}"/>
|
||||
<javac destdir="${writelatex-git-bridge.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac">
|
||||
<javac destdir="${writelatex-git-bridge.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
|
||||
<compilerarg line="${compiler.args.writelatex-git-bridge}"/>
|
||||
<bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
|
||||
<classpath refid="writelatex-git-bridge.module.classpath"/>
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
path.variable.maven_repository=/Users/Roxy/.m2/repository
|
||||
jdk.home.1.7=/Library/Java/JavaVirtualMachines/jdk1.7.0_60.jdk/Contents/Home
|
||||
Loading…
Reference in a new issue