move everything out of subdirectory

This commit is contained in:
Aaron Neyer 2013-12-15 14:12:57 -05:00
parent 71aacf1305
commit fed46a2a49
151 changed files with 191 additions and 2359 deletions

4
.gitignore vendored
View File

@ -1,8 +1,8 @@
*.class
#ignore builds
limelight-pc/build/*
limelight-pc/classes/*
build/*
classes/*
#ignore mac DS_STORE
.DS_STORE

View File

View File

@ -1,10 +0,0 @@
!SESSION 2013-11-28 05:45:26.508 -----------------------------------------------
eclipse.buildId=4.3.0.M20130911-1000
java.version=1.6.0_65
java.vendor=Apple Inc.
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments: -product org.eclipse.epp.package.standard.product -keyring /Users/diegowaxemberg/.eclipse_keyring -showlocation
Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.standard.product -keyring /Users/diegowaxemberg/.eclipse_keyring -showlocation
!ENTRY org.eclipse.core.net 1 0 2013-11-28 05:45:48.437
!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences

View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
version=1

View File

@ -1,4 +0,0 @@
eclipse.preferences.version=1
org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<launchPerspectives/>\n
pref_state_memento.org.eclipse.debug.ui.DebugVieworg.eclipse.debug.ui.DebugView=<?xml version\="1.0" encoding\="UTF-8"?>\n<DebugViewMemento org.eclipse.debug.ui.BREADCRUMB_DROPDOWN_AUTO_EXPAND\="false"/>
preferredDetailPanes=DefaultDetailPane\:DefaultDetailPane|

View File

@ -1,10 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.classpathVariable.JRE_LIB=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar
org.eclipse.jdt.core.classpathVariable.JRE_SRC=
org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.launching.PREF_VM_XML=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<vmSettings defaultVM\="52,org.eclipse.jdt.internal.launching.macosx.MacOSXType19,com.apple.javajdk16" defaultVMConnector\="">\n<vmType id\="org.eclipse.jdt.internal.launching.macosx.MacOSXType">\n<vm id\="com.apple.javajdk16" name\="Java SE 6 [1.6.0_65-b14-462]" path\="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"/>\n</vmType>\n</vmSettings>\n

View File

@ -1,15 +0,0 @@
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jdt.ui.text.code_templates_migrated=true
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author dwaxemberg\n * ${tags}\n */</template></templates>
org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true

View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.team.ui.first_time=false

View File

@ -1,3 +0,0 @@
eclipse.preferences.version=1
lineNumberRuler=true
overviewRuler_migration=migrated_3.1

View File

@ -1,5 +0,0 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1385046780921
quickStart=false
tipsAndTricks=true

View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
showIntro=false

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
INDEX VERSION 1.126+/Users/diegowaxemberg/Documents/Repositories/limelight-pc/.metadata/.plugins/org.eclipse.jdt.core

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<dirs>
<entry loc="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home" stamp="1385046659000"/>
</dirs>

View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<libraryInfos>
<libraryInfo home="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home" version="1.6.0_65">
<bootpath>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsfd.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar"/>
<entry path="/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/ui.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/laf.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/sunrsasign.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsse.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jce.jar"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/charsets.jar"/>
</bootpath>
<extensionDirs>
<entry path="/Library/Java/Extensions"/>
<entry path="/System/Library/Java/Extensions"/>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext"/>
</extensionDirs>
<endorsedDirs>
<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/endorsed"/>
</endorsedDirs>
</libraryInfo>
</libraryInfos>

View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>

View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
<item value="true" key="group_libraries"/>
<item value="false" key="linkWithEditor"/>
<item value="2" key="layout"/>
<item value="1" key="rootMode"/>
<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;Aggregate for window 1385635557939&quot;&gt;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0A;&lt;xmlDefinedFilters&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.ExternalPluginLibrariesFilter1&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.BinaryProjectFilter1&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0A;&lt;/customFilters&gt;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
</section>
<section name="JavaElementSearchActions">
</section>
<section name="BuildPathsPropertyPage">
<item value="2" key="pageIndex"/>
</section>
<section name="org.eclipse.jdt.internal.ui.preferences.EditTemplateDialog_dialogBounds">
<item value="597" key="DIALOG_WIDTH"/>
<item value="189" key="DIALOG_Y_ORIGIN"/>
<item value="12" key="DIALOG_X_ORIGIN"/>
<item value="261" key="DIALOG_HEIGHT"/>
<item value="1|Lucida Grande|11.0|0|COCOA|1|LucidaGrande" key="DIALOG_FONT_NAME"/>
</section>
</section>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<session version="1.0">
<refactoring comment="Delete resource &apos;limelight-pc&apos;" deleteContents="false" description="Delete resource &apos;limelight-pc&apos;" element1="/limelight-pc" flags="7" id="org.eclipse.ltk.core.refactoring.delete.resources" resources="1" stamp="1385636365183"/>
</session>

View File

@ -1 +0,0 @@
1385636365183 Delete resource 'limelight-pc'

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="RefactoringWizard.preview">
<item value="400" key="height"/>
<item value="600" key="width"/>
</section>
</section>

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="ChooseWorkspaceDialogSettings">
<item value="195" key="DIALOG_Y_ORIGIN"/>
<item value="345" key="DIALOG_X_ORIGIN"/>
</section>
<section name="WORKBENCH_SETTINGS">
<list key="ENABLED_TRANSFERS">
</list>
</section>
</section>

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.ui.internal.QuickAccess">
<item value="800" key="dialogWidth"/>
<item value="500" key="dialogHeight"/>
<list key="orderedProviders">
</list>
<list key="textArray">
</list>
<list key="orderedElements">
</list>
<list key="textEntries">
</list>
</section>
<section name="WorkbenchPreferenceDialogSettings">
<item value="44" key="DIALOG_Y_ORIGIN"/>
<item value="331" key="DIALOG_X_ORIGIN"/>
</section>
</section>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1385635557940_0" label="Window Working Set" name="Aggregate for window 1385635557939"/>
</workingSetManager>

View File

@ -1 +0,0 @@
org.eclipse.core.runtime=1

189
build.xml Normal file
View File

@ -0,0 +1,189 @@
<?xml version="2.0" encoding="UTF-8" standalone="no"?>
<project default="all" name="Create Runnable Jar for Limelight">
<property name="one-jar.dist.dir" value="${basedir}"/>
<property name="src.dir" location="${basedir}/src"/>
<property name="libs.dir" location="${basedir}/libs"/>
<property name="libs.osx64.dir" location="${libs.dir}/osx"/>
<property name="libs.lin32.dir" location="${libs.dir}/lin32"/>
<property name="libs.lin64.dir" location="${libs.dir}/lin64"/>
<property name="libs.win32.dir" location="${libs.dir}/win32"/>
<property name="libs.win64.dir" location="${libs.dir}/win64"/>
<property name="lib.dir" location="${basedir}/lib"/>
<property name="build.dir" location="${basedir}/build"/>
<property name="classes.dir" location="${basedir}/classes"/>
<target name="init">
<mkdir dir="${classes.dir}"/>
<mkdir dir="${classes.dir}/lib"/>
<mkdir dir="${classes.dir}/src"/>
<mkdir dir="${build.dir}"/>
</target>
<import file="one-jar-ant-task.xml"/>
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${classes.dir}"/>
</target>
<target name="all" depends="limelight-osx,limelight-lin32,limelight-lin64,limelight-win32,limelight-win64"/>
<target name="limelight-osx" depends="init">
<!-- compile limelight -->
<javac includeantruntime="false" destdir="${classes.dir}/src">
<src path="${src.dir}"/>
<classpath path="${build.dir}"/>
<classpath>
<fileset dir="${libs.dir}" includes="*.jar"/>
</classpath>
</javac>
<!-- construct one-jar file -->
<one-jar destfile="${build.dir}/limelight-osx64.jar">
<manifest>
<attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
</manifest>
<main>
<!-- construct limelight.jar -->
<fileset dir="${classes.dir}/src"/>
</main>
<lib>
<fileset dir="${libs.dir}" includes="*.jar"/>
</lib>
<binlib>
<fileset dir="${libs.osx64.dir}" includes="*"/>
</binlib>
</one-jar>
</target>
<target name="limelight-lin32" depends="init">
<!-- compile limelight -->
<javac includeantruntime="false" destdir="${classes.dir}/src">
<src path="${src.dir}"/>
<classpath path="${build.dir}"/>
<classpath>
<fileset dir="${libs.dir}" includes="*.jar"/>
</classpath>
</javac>
<!-- construct one-jar file -->
<one-jar destfile="${build.dir}/limelight-lin32.jar">
<manifest>
<attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
</manifest>
<main>
<!-- construct limelight.jar -->
<fileset dir="${classes.dir}/src"/>
</main>
<lib>
<fileset dir="${libs.dir}" includes="*.jar"/>
</lib>
<binlib>
<fileset dir="${libs.lin32.dir}" includes="*"/>
</binlib>
</one-jar>
</target>
<target name="limelight-lin64" depends="init">
<!-- compile limelight -->
<javac includeantruntime="false" destdir="${classes.dir}/src">
<src path="${src.dir}"/>
<classpath path="${build.dir}"/>
<classpath>
<fileset dir="${libs.dir}" includes="*.jar"/>
</classpath>
</javac>
<!-- construct one-jar file -->
<one-jar destfile="${build.dir}/limelight-lin64.jar">
<manifest>
<attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
</manifest>
<main>
<!-- construct limelight.jar -->
<fileset dir="${classes.dir}/src"/>
</main>
<lib>
<fileset dir="${libs.dir}" includes="*.jar"/>
</lib>
<binlib>
<fileset dir="${libs.lin64.dir}" includes="*"/>
</binlib>
</one-jar>
</target>
<target name="limelight-win32" depends="init">
<!-- compile limelight -->
<javac includeantruntime="false" destdir="${classes.dir}/src">
<src path="${src.dir}"/>
<classpath path="${build.dir}"/>
<classpath>
<fileset dir="${libs.dir}" includes="*.jar"/>
</classpath>
</javac>
<!-- construct one-jar file -->
<one-jar destfile="${build.dir}/limelight-win32.jar">
<manifest>
<attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
</manifest>
<main>
<!-- construct limelight.jar -->
<fileset dir="${classes.dir}/src"/>
</main>
<lib>
<fileset dir="${libs.dir}" includes="*.jar"/>
</lib>
<binlib>
<fileset dir="${libs.win32.dir}" includes="*"/>
</binlib>
</one-jar>
</target>
<target name="limelight-win64" depends="init">
<!-- compile limelight -->
<javac includeantruntime="false" destdir="${classes.dir}/src">
<src path="${src.dir}"/>
<classpath path="${build.dir}"/>
<classpath>
<fileset dir="${libs.dir}" includes="*.jar"/>
</classpath>
</javac>
<!-- construct one-jar file -->
<one-jar destfile="${build.dir}/limelight-win64.jar">
<manifest>
<attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
</manifest>
<main>
<!-- construct limelight.jar -->
<fileset dir="${classes.dir}/src"/>
</main>
<lib>
<fileset dir="${libs.dir}" includes="*.jar"/>
</lib>
<binlib>
<fileset dir="${libs.win64.dir}" includes="*"/>
</binlib>
</one-jar>
</target>
</project>

Some files were not shown because too many files have changed in this diff Show More