Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Holger Z. <hz...@us...> - 2004-10-24 20:40:30
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12635 Modified Files: build.xml Added Files: install.xml Log Message: standalone installer Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 19 Oct 2004 09:34:47 -0000 1.12 --- build.xml 24 Oct 2004 20:40:06 -0000 1.13 *************** *** 8,11 **** --- 8,15 ---- </taskdef> + + <taskdef name="izpack" classpath="lib/izpack/standalone-compiler.jar" + classname="com.izforge.izpack.ant.IzPackTask"/> + <!-- properties --> <property name="version" value="cvs"/> *************** *** 121,124 **** --- 125,131 ---- <method name="main(java.lang.String[])"/> </keep> + <keep access="public" name="jake2.install.Q2DataInstaller"> + <method name="main(java.lang.String[])"/> + </keep> </proguard> </target> *************** *** 184,187 **** --- 191,203 ---- </target> + <!-- standalone installer --> + <target name="installer" depends="dist"> + <izpack input="${basedir}/install.xml" + output="${basedir}/Jake2-install.jar" + installerType="standard" + basedir="${dist}" + izPackDir="${basedir}/lib/izpack"/> + </target> + <!-- webstart --> <target name="webstart" depends="dist"> --- NEW FILE: install.xml --- <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> <installation version="1.0"> <info> <appname>Jake2</appname> <appversion>cvs</appversion> <authors> <author name="Bytonic Software" email="ja...@by..."/> </authors> <url>http://www.bytonic.de</url> </info> <guiprefs width="640" height="480" resizable="no"/> <locale> <langpack iso3="eng"/> </locale> <resources> <res id="LicencePanel.licence" src="LICENSE"/> <res id="InfoPanel.info" src="README"/> <!-- res id="Installer.image" src="../resources/icon.png"/ --> </resources> <panels> <panel classname="HelloPanel"/> <panel classname="InfoPanel"/> <panel classname="LicencePanel"/> <panel classname="TargetPanel"/> <panel classname="PacksPanel"/> <panel classname="InstallPanel"/> <panel classname="SimpleFinishPanel"/> </panels> <packs> <pack name="Jake2" required="yes"> <description>Jake2 files</description> <fileset dir="." targetdir="$INSTALL_PATH"> <include name="*"/> <include name="lib/*.jar"/> <exclude name="*.bat"/> <exclude name="*.sh"/> </fileset> <executable type="jar" targetfile="$INSTALL_PATH/lib/jake2.jar" class="jake2.install.Q2DataInstaller" stage="postinstall" keep="true"> <args> <arg value="$INSTALL_PATH"/> </args> </executable> </pack> <pack name="Linux libraries and scripts" required="yes"> <os name="Linux" arch="i386"/> <description>jogl and joal libraries for Linux</description> <file src="lib/linux" targetdir="$INSTALL_PATH/lib"/> <file src="Jake2.sh" targetdir="$INSTALL_PATH"/> <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> </pack> <pack name="Windows libraries and scripts" required="yes"> <os family="windows" arch="i386"/> <description>jogl and joal libraries for Windows</description> <file src="lib/windows" targetdir="$INSTALL_PATH/lib"/> <file src="Jake2.bat" targetdir="$INSTALL_PATH"/> <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> </pack> </packs> </installation> |
|
From: Holger Z. <hz...@us...> - 2004-10-24 20:40:17
|
Update of /cvsroot/jake2/jake2/src/jake2/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12635/src/jake2/install Added Files: Q2DataInstaller.java Log Message: standalone installer --- NEW FILE: Q2DataInstaller.java --- /* * Q2DataDialog.java * Copyright (C) 2003 * * $Id: Q2DataInstaller.java,v 1.1 2004/10/24 20:40:07 hzi Exp $ */ package jake2.install; import jake2.Globals; import java.awt.*; import java.awt.event.*; import java.io.*; import java.util.Enumeration; import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import javax.imageio.ImageIO; import javax.swing.*; public class Q2DataInstaller extends javax.swing.JDialog { static final String home = System.getProperty("user.home"); static final String sep = System.getProperty("file.separator"); String destdir; public Q2DataInstaller(String dir) { super(); destdir = dir; initComponents(); DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode(); int x = (mode.getWidth() - getWidth()) / 2; int y = (mode.getHeight() - getHeight()) / 2; setLocation(x, y); dir = home + sep + "jake2" + sep + "baseq2"; jTextField1.setText(dir); } private void initComponents() {//GEN-BEGIN:initComponents java.awt.GridBagConstraints gridBagConstraints; choosePanel = new javax.swing.JPanel(); statusPanel = new JPanel(); status = new JLabel("initializing Jake2..."); jTextField1 = new javax.swing.JTextField(); changeButton = new javax.swing.JButton(); cancelButton = new javax.swing.JButton(); exitButton = new javax.swing.JButton(); okButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("Jake2 - Bytonic Software"); setResizable(false); addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } }); choosePanel.setLayout(new java.awt.GridBagLayout()); choosePanel.setMaximumSize(new java.awt.Dimension(400, 100)); choosePanel.setMinimumSize(new java.awt.Dimension(400, 100)); choosePanel.setPreferredSize(new java.awt.Dimension(400, 100)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 1; gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); gridBagConstraints.weightx = 0; gridBagConstraints.anchor = GridBagConstraints.SOUTHWEST; choosePanel.add(new JLabel("baseq2 directory"),gridBagConstraints); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.insets = new java.awt.Insets(5, 2, 5, 2); gridBagConstraints.weightx = 1; choosePanel.add(jTextField1, gridBagConstraints); changeButton.setText("..."); changeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { changeButtonActionPerformed(evt); } }); gridBagConstraints.gridx = 3; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 1; gridBagConstraints.weightx = 0; gridBagConstraints.fill = java.awt.GridBagConstraints.NONE; gridBagConstraints.insets = new java.awt.Insets(5, 2, 5, 5); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; choosePanel.add(changeButton, gridBagConstraints); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; gridBagConstraints.gridwidth = 4; gridBagConstraints.weightx = 0; gridBagConstraints.weighty = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; choosePanel.add(new JPanel(), gridBagConstraints); cancelButton.setText("Cancel"); cancelButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButtonActionPerformed(evt); } }); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.gridwidth = 4; gridBagConstraints.weighty = 0; gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH; choosePanel.add(cancelButton, gridBagConstraints); exitButton.setText("Exit"); exitButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { exitButtonActionPerformed(evt); } }); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.gridwidth = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST; choosePanel.add(exitButton, gridBagConstraints); okButton.setText("OK"); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okButtonActionPerformed(evt); } }); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 2; gridBagConstraints.gridwidth = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHEAST; choosePanel.add(okButton, gridBagConstraints); Jake2Canvas c = new Jake2Canvas(); getContentPane().add(c, BorderLayout.CENTER); statusPanel.setLayout(new java.awt.GridBagLayout()); statusPanel.setMaximumSize(new java.awt.Dimension(400, 100)); statusPanel.setMinimumSize(new java.awt.Dimension(400, 100)); statusPanel.setPreferredSize(new java.awt.Dimension(400, 100)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); gridBagConstraints.weightx = 1.0; statusPanel.add(status, gridBagConstraints); getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH); progressPanel = new ProgressPanel(this); installPanel = new InstallPanel(this); notFoundPanel = new NotFoundPanel(this); pack(); } private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) { showNotFoundPanel(); } private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) { System.exit(1); dispose(); } private void okButtonActionPerformed(java.awt.event.ActionEvent evt) { synchronized(this) { notifyAll(); } } private void changeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeButtonActionPerformed JFileChooser chooser = new JFileChooser(); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); chooser.setMultiSelectionEnabled(false); chooser.setDialogTitle("choose a valid baseq2 directory"); chooser.showDialog(this, "OK"); dir = null; try { dir = chooser.getSelectedFile().getCanonicalPath(); } catch (Exception e) {} if (dir != null) jTextField1.setText(dir); else dir = jTextField1.getText(); }//GEN-LAST:event_changeButtonActionPerformed private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing System.exit(1); dispose(); }//GEN-LAST:event_formWindowClosing // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton changeButton; private javax.swing.JButton exitButton; private javax.swing.JButton cancelButton; private Jake2Canvas canvas; private javax.swing.JPanel choosePanel; private JPanel statusPanel; private ProgressPanel progressPanel; private InstallPanel installPanel; private NotFoundPanel notFoundPanel; private JLabel status; private javax.swing.JTextField jTextField1; private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables private String dir; void showChooseDialog() { getContentPane().remove(statusPanel); getContentPane().remove(progressPanel); getContentPane().remove(installPanel); getContentPane().remove(notFoundPanel); getContentPane().add(choosePanel, BorderLayout.SOUTH); validate(); repaint(); } void showStatus() { getContentPane().remove(choosePanel); getContentPane().remove(installPanel); getContentPane().add(statusPanel, BorderLayout.SOUTH); validate(); repaint(); } void showProgressPanel() { getContentPane().remove(choosePanel); getContentPane().remove(installPanel); getContentPane().remove(notFoundPanel); getContentPane().add(progressPanel, BorderLayout.SOUTH); validate(); repaint(); } void showInstallPanel() { getContentPane().remove(choosePanel); getContentPane().remove(statusPanel); getContentPane().remove(notFoundPanel); getContentPane().add(installPanel, BorderLayout.SOUTH); validate(); repaint(); } void showNotFoundPanel() { getContentPane().remove(choosePanel); getContentPane().remove(installPanel); getContentPane().remove(statusPanel); getContentPane().add(notFoundPanel, BorderLayout.SOUTH); validate(); repaint(); } void setStatus(String text) { status.setText(text); } void installQ2Data() { showNotFoundPanel(); synchronized(this) { try { wait(); } catch (Exception e) {} } setVisible(false); dispose(); } static class Jake2Canvas extends Canvas { private Image image; Jake2Canvas() { setSize(400, 200); try { image = ImageIO.read(getClass().getResource("/splash.png")); } catch (Exception e) {} } /* (non-Javadoc) * @see java.awt.Component#paint(java.awt.Graphics) */ public void paint(Graphics g) { g.drawImage(image, 0, 0, null); } } static class NotFoundPanel extends JPanel { private Q2DataInstaller parent; private JCheckBox install; private JButton exit; private JButton ok; private JLabel message; NotFoundPanel(Q2DataInstaller d) { parent = d; initComponents(); } private void initComponents() { GridBagConstraints constraints = new GridBagConstraints(); setLayout(new GridBagLayout()); Dimension d = new Dimension(400, 100); setMinimumSize(d); setMaximumSize(d); setPreferredSize(d); message = new JLabel(" "); message.setForeground(Color.RED); constraints.gridx = 0; constraints.gridy = 0; constraints.gridwidth = 2; constraints.insets = new Insets(5, 5, 2, 5); constraints.anchor = GridBagConstraints.CENTER; add(message, constraints); constraints.gridx = 1; constraints.gridy = 1; constraints.gridwidth = 2; constraints.weightx = 1; constraints.fill = GridBagConstraints.HORIZONTAL; constraints.insets = new Insets(0, 2, 0, 5); constraints.anchor = GridBagConstraints.WEST; constraints.gridx = 1; constraints.gridy = 2; JLabel label = new JLabel("install Quake2 demo data"); label.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { install.setSelected(!install.isSelected()); } }); add(label, constraints); install = new JCheckBox(); install.setSelected(true); constraints.gridx = 0; constraints.gridy = 1; constraints.gridwidth = 1; constraints.weightx = 0; constraints.insets = new Insets(0, 5, 0, 2); constraints.fill = GridBagConstraints.NONE; constraints.anchor = GridBagConstraints.EAST; constraints.gridx = 0; constraints.gridy = 2; add(install, constraints); constraints.gridx = 0; constraints.gridy = 3; constraints.gridwidth = 2; constraints.weighty = 1; constraints.insets = new Insets(5, 5, 5, 5); constraints.fill = GridBagConstraints.NONE; constraints.anchor = GridBagConstraints.SOUTHWEST; exit = new JButton("Exit"); exit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { System.exit(0); }}); add(exit, constraints); constraints.gridx = 2; constraints.gridy = 3; constraints.gridwidth = 1; constraints.anchor = GridBagConstraints.SOUTHEAST; ok = new JButton("OK"); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { ok(); }}); add(ok, constraints); } private void ok() { if (!install.isSelected()) System.exit(0); parent.progressPanel.destDir = parent.destdir; parent.progressPanel.mirror = "q2-314-demo-x86.exe"; parent.showProgressPanel(); new Thread(parent.progressPanel).start(); } } static class InstallPanel extends JPanel { private Vector mirrorNames = new Vector(); private Vector mirrorLinks = new Vector(); private Q2DataInstaller parent; private JComboBox mirrorBox; private JTextField destDir; private JButton cancel; private JButton exit; private JButton install; private JButton choose; public InstallPanel(Q2DataInstaller d) { initComponents(); String dir = Q2DataInstaller.home + Q2DataInstaller.sep + "jake2"; destDir.setText(dir); initMirrors(); parent = d; } private void initComponents() { GridBagConstraints constraints = new GridBagConstraints(); setLayout(new GridBagLayout()); Dimension d = new Dimension(400, 100); setMinimumSize(d); setMaximumSize(d); setPreferredSize(d); constraints.gridx = 0; constraints.gridy = 0; constraints.insets = new Insets(5, 5, 0, 5); constraints.anchor = GridBagConstraints.SOUTHWEST; add(new JLabel("download mirror"), constraints); constraints.gridx = 0; constraints.gridy = 1; constraints.insets = new Insets(5, 5, 5, 5); add(new JLabel("destination directory"), constraints); constraints.gridx = 1; constraints.gridy = 0; constraints.weightx = 1; constraints.gridwidth = 3; constraints.insets = new Insets(5, 5, 0, 5); constraints.fill = GridBagConstraints.HORIZONTAL; mirrorBox = new JComboBox(); add(mirrorBox, constraints); constraints.gridx = 1; constraints.gridy = 1; constraints.gridwidth = 2; constraints.fill = GridBagConstraints.BOTH; constraints.insets = new Insets(5, 5, 5, 5); destDir = new JTextField(); add(destDir, constraints); constraints.gridx = 3; constraints.gridy = 1; constraints.weightx = 0; constraints.gridwidth = 1; constraints.fill = GridBagConstraints.NONE; choose = new JButton("..."); choose.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { choose(); }}); add(choose, constraints); constraints.gridx = 0; constraints.gridy = 2; constraints.gridwidth = 1; constraints.weighty = 1; constraints.fill = GridBagConstraints.NONE; exit = new JButton("Exit"); exit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { exit(); }}); add(exit, constraints); constraints.gridx = 0; constraints.gridy = 2; constraints.gridwidth = 4; constraints.anchor = GridBagConstraints.SOUTH; cancel = new JButton("Cancel"); cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { cancel(); }}); add(cancel, constraints); constraints.gridx = 2; constraints.gridy = 2; constraints.gridwidth = 2; constraints.anchor = GridBagConstraints.SOUTHEAST; install = new JButton("Install"); install.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { install(); }}); add(install, constraints); } private void readMirrors() { InputStream in = getClass().getResourceAsStream("/mirrors"); BufferedReader r = new BufferedReader(new InputStreamReader(in)); try { int i = 0; while (true) { String name = r.readLine(); String value = r.readLine(); if (name == null || value == null) break; mirrorNames.add(name); mirrorLinks.add(value); } } catch (Exception e) {} finally { try { r.close(); } catch (Exception e1) {} try { in.close(); } catch (Exception e1) {} } } private void initMirrors() { readMirrors(); for (int i = 0; i < mirrorNames.size(); i++) { mirrorBox.addItem(mirrorNames.get(i)); } int i = Globals.rnd.nextInt(mirrorNames.size()); mirrorBox.setSelectedIndex(i); } private void cancel() { parent.showNotFoundPanel(); } private void install() { parent.progressPanel.destDir = destDir.getText(); parent.progressPanel.mirror = (String)mirrorLinks.get(mirrorBox.getSelectedIndex()); parent.showProgressPanel(); new Thread(parent.progressPanel).start(); } private void exit() { System.exit(0); } private void choose() { JFileChooser chooser = new JFileChooser(); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); chooser.setMultiSelectionEnabled(false); chooser.setDialogTitle("choose destination directory"); chooser.showDialog(this, "OK"); String dir = null; try { dir = chooser.getSelectedFile().getCanonicalPath(); } catch (Exception e) {} if (dir != null) destDir.setText(dir); } } static class ProgressPanel extends JPanel implements Runnable { static byte[] buf = new byte[8192]; String destDir; String mirror; JProgressBar progress = new JProgressBar(); JLabel label = new JLabel(""); JButton cancel = new JButton("Cancel"); Q2DataInstaller parent; boolean running; public ProgressPanel(Q2DataInstaller d) { initComponents(); parent = d; } void initComponents() { progress.setMinimum(0); progress.setMaximum(100); progress.setStringPainted(true); setLayout(new GridBagLayout()); GridBagConstraints gridBagConstraints = new GridBagConstraints(); gridBagConstraints = new GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 1; gridBagConstraints.fill = GridBagConstraints.HORIZONTAL; gridBagConstraints.insets = new Insets(5, 10, 5, 10); gridBagConstraints.weightx = 1.0; gridBagConstraints.anchor = GridBagConstraints.SOUTH; add(label, gridBagConstraints); gridBagConstraints.gridy = 1; gridBagConstraints.anchor = GridBagConstraints.NORTH; add(progress, gridBagConstraints); gridBagConstraints.gridy = 1; gridBagConstraints.anchor = GridBagConstraints.SOUTH; gridBagConstraints.fill = GridBagConstraints.NONE; gridBagConstraints.weighty = 1; gridBagConstraints.weightx = 0; cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { cancel(); }}); add(cancel, gridBagConstraints); Dimension d = new Dimension(400, 100); setMinimumSize(d); setMaximumSize(d); setPreferredSize(d); } void cancel() { synchronized(this) { running = false; } } public void run() { synchronized(this) { running = true; } File dir = null; try { dir = new File(destDir); dir.mkdirs(); } catch (Exception e) {} try { if (!dir.isDirectory() || !dir.canWrite()) { endInstall("can't write to " + destDir); return; } } catch (Exception e) { endInstall(e.getMessage()); return; } try { installData(mirror); } catch (Exception e) { endInstall(e.getMessage()); return; } endInstall("installation successful"); } void installData(String filename) throws Exception { InputStream in = null; OutputStream out = null; try { ZipFile f = new ZipFile(filename); Enumeration e = f.entries(); while (e.hasMoreElements()) { ZipEntry entry = (ZipEntry)e.nextElement(); String name = entry.getName(); int i; if ((i = name.indexOf("/baseq2")) > -1 && name.indexOf(".dll") == -1) { name = destDir + name.substring(i); File outFile = new File(name); if (entry.isDirectory()) { outFile.mkdirs(); } else { label.setText("installing " + outFile.getName()); progress.setMaximum((int)entry.getSize()/1024); progress.setValue(0); outFile.getParentFile().mkdirs(); out = new FileOutputStream(outFile); in = f.getInputStream(entry); copyStream(in, out); } } } } catch (Exception e) { throw e; } finally { try {in.close();} catch (Exception e1) {} try {out.close();} catch (Exception e1) {} } } void endInstall(String message) { parent.notFoundPanel.message.setText(message); parent.dir = destDir + "/baseq2"; parent.showChooseDialog(); parent.okButtonActionPerformed(null); } void copyStream(InputStream in, OutputStream out) throws Exception { try { int c = 0; int l; while ((l = in.read(buf)) > 0) { if (!running) throw new Exception("installation canceled"); out.write(buf, 0, l); c += l; int k = c / 1024; progress.setValue(k); progress.setString(k + "/" + progress.getMaximum() + " KB"); } } catch (Exception e) { throw e; } finally { try { in.close(); } catch (Exception e) {} try { out.close(); } catch (Exception e) {} } } } public static void main(String[] args) { if (args.length != 1) System.exit(1); Q2DataInstaller installer = new Q2DataInstaller(args[0]); installer.setVisible(true); installer.installQ2Data(); System.exit(0); } } |
|
From: Holger Z. <hz...@us...> - 2004-10-24 20:40:17
|
Update of /cvsroot/jake2/jake2/lib/izpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12635/lib/izpack Added Files: standalone-compiler.jar Log Message: standalone installer --- NEW FILE: standalone-compiler.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Holger Z. <hz...@us...> - 2004-10-24 20:35:33
|
Update of /cvsroot/jake2/jake2/src/jake2/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12577/src/jake2/install Log Message: Directory /cvsroot/jake2/jake2/src/jake2/install added to the repository |
|
From: Holger Z. <hz...@us...> - 2004-10-24 20:35:33
|
Update of /cvsroot/jake2/jake2/lib/izpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12577/lib/izpack Log Message: Directory /cvsroot/jake2/jake2/lib/izpack added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:35:48
|
Update of /cvsroot/jake2/jake2/patch/net/java/games/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3537/patch/net/java/games/joal Modified Files: ALFactory.java Log Message: sorry, the init() method throws an exception if the dlopen fails so now it works :-) Index: ALFactory.java =================================================================== RCS file: /cvsroot/jake2/jake2/patch/net/java/games/joal/ALFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ALFactory.java 24 Oct 2004 13:03:29 -0000 1.1 --- ALFactory.java 24 Oct 2004 13:35:40 -0000 1.2 *************** *** 59,70 **** */ public static boolean initialize() throws OpenALException { - String sep = System.getProperty("file.separator"); - String openalPath = System.getProperty("user.home") + sep + ".jake2"; String osProperty = System.getProperty("os.name"); if (osProperty.startsWith("Win")) { isInitialized = init(new String[] { "OpenAL32.dll" }); } else if (osProperty.startsWith("Linux")) { ! isInitialized = init(new String[] { "libopenal.so" }); ! if (!isInitialized) { isInitialized = init(new String[] { openalPath + sep + "libopenal.so" }); --- 59,73 ---- */ public static boolean initialize() throws OpenALException { String osProperty = System.getProperty("os.name"); if (osProperty.startsWith("Win")) { isInitialized = init(new String[] { "OpenAL32.dll" }); } else if (osProperty.startsWith("Linux")) { ! try { ! // use the system wide lib ! isInitialized = init(new String[] { "libopenal.so" }); ! } catch (OpenALException e) { ! // fallback to bytonic's libopenal.so ! String sep = System.getProperty("file.separator"); ! String openalPath = System.getProperty("user.home") + sep + ".jake2"; isInitialized = init(new String[] { openalPath + sep + "libopenal.so" }); |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:03:38
|
Update of /cvsroot/jake2/jake2/patch/net/java/games/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28418/patch/net/java/games/joal Added Files: ALFactory.java Log Message: patch for joal: fallback for libopenal.so loading to .jake2 path --- NEW FILE: ALFactory.java --- /** * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * -Redistribution of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * -Redistribution in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * * Neither the name of Sun Microsystems, Inc. or the names of contributors may * be used to endorse or promote products derived from this software without * specific prior written permission. * * This software is provided "AS IS," without a warranty of any kind. * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR * NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS * LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A * RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT * OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed or intended for use in the * design, construction, operation or maintenance of any nuclear facility. */ package net.java.games.joal; /** * This class provides factory methods for generating AL and ALC objects. The * class must be initialized before use, and should be deinitialized when OpenAL * functionality is no longer needed to free up native resources. * * @author Athomas Goldberg */ public class ALFactory { static { System.loadLibrary("joal"); } private static boolean isInitialized = false; private static ALImpl al; private static ALC alc; /** * Initialize the OpenAL environment * * @return true is OpenAL was able to initialize, false if OpenAL was not * able to intialize */ public static boolean initialize() throws OpenALException { String sep = System.getProperty("file.separator"); String openalPath = System.getProperty("user.home") + sep + ".jake2"; String osProperty = System.getProperty("os.name"); if (osProperty.startsWith("Win")) { isInitialized = init(new String[] { "OpenAL32.dll" }); } else if (osProperty.startsWith("Linux")) { isInitialized = init(new String[] { "libopenal.so" }); if (!isInitialized) { isInitialized = init(new String[] { openalPath + sep + "libopenal.so" }); } } else { isInitialized = init(new String[] { "/Library/Frameworks/OpenAL.framework/Versions/Current/OpenAL" }); } return isInitialized; } private static native boolean init(String[] oalPaths) throws OpenALException; /** * Deinitialize the OpenAL environment * * @return true if OpenAL was able to be deinitialized, false if OpenAL uas * unable to be deinitialized */ public static native boolean deinitialize(); /** * Get the default AL object. This object is used to access most of the * OpenAL functionality. * * @return the AL object */ public static AL getAL() throws OpenALException { if (!isInitialized) { initialize(); } if (isInitialized && al == null) { al = new ALImpl(); } return al; } /** * Get the default ALC object. This object is used to access most of the * OpenAL context functionality. * * @return the ALC object */ public static ALC getALC() throws OpenALException { if (!isInitialized) { initialize(); } if (isInitialized && alc == null) { alc = new ALCImpl(); } return alc; } } |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:01:41
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27908 Modified Files: .classpath Log Message: add the new source path (patch) Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .classpath 19 Sep 2004 12:48:53 -0000 1.4 --- .classpath 24 Oct 2004 13:01:32 -0000 1.5 *************** *** 1,11 **** <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src"/> ! <classpathentry kind="src" path="test"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/linux/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/windows/joal.jar"/> ! <classpathentry kind="lib" path="lib/jogl/jogl.jar"/> ! <classpathentry kind="lib" path="resources"/> ! <classpathentry kind="output" path="build"/> </classpath> --- 1,12 ---- <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src"/> ! <classpathentry kind="src" path="test"/> ! <classpathentry kind="src" path="patch"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/linux/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/windows/joal.jar"/> ! <classpathentry kind="lib" path="lib/jogl/jogl.jar"/> ! <classpathentry kind="lib" path="resources"/> ! <classpathentry kind="output" path="build"/> </classpath> |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:00:08
|
Update of /cvsroot/jake2/jake2/patch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27393/patch Log Message: Directory /cvsroot/jake2/jake2/patch added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:00:08
|
Update of /cvsroot/jake2/jake2/patch/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27393/patch/net Log Message: Directory /cvsroot/jake2/jake2/patch/net added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:00:08
|
Update of /cvsroot/jake2/jake2/patch/net/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27393/patch/net/java Log Message: Directory /cvsroot/jake2/jake2/patch/net/java added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:00:05
|
Update of /cvsroot/jake2/jake2/patch/net/java/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27393/patch/net/java/games Log Message: Directory /cvsroot/jake2/jake2/patch/net/java/games added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-24 13:00:05
|
Update of /cvsroot/jake2/jake2/patch/net/java/games/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27393/patch/net/java/games/joal Log Message: Directory /cvsroot/jake2/jake2/patch/net/java/games/joal added to the repository |
|
From: Carsten W. <ca...@us...> - 2004-10-21 03:33:04
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1530/src/jake2/game Modified Files: Info.java Log Message: i think it is clearer Index: Info.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Info.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Info.java 22 Sep 2004 19:22:03 -0000 1.4 --- Info.java 21 Oct 2004 03:32:53 -0000 1.5 *************** *** 148,156 **** */ public static boolean Info_Validate(String s) { ! if (s.indexOf('"') != -1) ! //return false; ! if (s.indexOf(';') != -1) ! return false; ! return true; } --- 148,152 ---- */ public static boolean Info_Validate(String s) { ! return !((s.indexOf('"') != -1) || (s.indexOf(';') != -1)); } |
|
From: Carsten W. <ca...@us...> - 2004-10-21 03:11:40
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28510/src/jake2/qcommon Modified Files: Cvar.java Log Message: it was the wrong function Index: Cvar.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cvar.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Cvar.java 22 Sep 2004 19:22:09 -0000 1.5 --- Cvar.java 21 Oct 2004 03:11:30 -0000 1.6 *************** *** 53,57 **** if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) { ! if (!Info.Info_Validate(var_name)) { Com.Printf("invalid info cvar name\n"); return null; --- 53,57 ---- if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) { ! if (!InfoValidate(var_name)) { Com.Printf("invalid info cvar name\n"); return null; |
|
From: Carsten W. <ca...@us...> - 2004-10-21 02:46:05
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22292/src/jake2/sound/joal Modified Files: JOALSoundImpl.java Log Message: selection of sexed sounds are now correct Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JOALSoundImpl.java 21 Oct 2004 01:51:45 -0000 1.6 --- JOALSoundImpl.java 21 Oct 2004 02:45:55 -0000 1.7 *************** *** 630,652 **** sfx = FindName(sexedFilename, false); ! if (sfx == null) { ! // no, so see if it exists ! int fileLength = FS.FileLength(sexedFilename.substring(1)); ! if (fileLength > 0) { ! // yes, register it ! sfx = RegisterSound(sexedFilename); ! } else if (model.equalsIgnoreCase("female")) { ! // retry it with female pak-file sounds ! String femaleFilename = "player/female/" + base.substring(1); ! sfx = AliasName(sexedFilename, femaleFilename); ! } else { ! // no chance, revert to the male sound in the pak0.pak ! String maleFilename = "player/male/" + base.substring(1); ! sfx = AliasName(sexedFilename, maleFilename); ! } } ! return sfx; } - static sfx_t[] known_sfx = new sfx_t[MAX_SFX]; --- 630,653 ---- sfx = FindName(sexedFilename, false); ! if (sfx != null) return sfx; ! ! // ! // fall back strategies ! // ! // not found , so see if it exists ! if (FS.FileLength(sexedFilename.substring(1)) > 0) { ! // yes, register it ! return RegisterSound(sexedFilename); } ! // try it with the female sound in the pak0.pak ! if (model.equalsIgnoreCase("female")) { ! String femaleFilename = "player/female/" + base.substring(1); ! if (FS.FileLength("sound/" + femaleFilename) > 0) ! return AliasName(sexedFilename, femaleFilename); ! } ! // no chance, revert to the male sound in the pak0.pak ! String maleFilename = "player/male/" + base.substring(1); ! return AliasName(sexedFilename, maleFilename); } static sfx_t[] known_sfx = new sfx_t[MAX_SFX]; |
|
From: Carsten W. <ca...@us...> - 2004-10-21 01:51:55
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9368/src/jake2/sound/joal Modified Files: JOALSoundImpl.java Log Message: sexed sound bug fixed Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JOALSoundImpl.java 22 Sep 2004 19:22:15 -0000 1.5 --- JOALSoundImpl.java 21 Oct 2004 01:51:45 -0000 1.6 *************** *** 608,613 **** // determine what model the client is using ! // TODO configstrings for player male and female are wrong ! String model = "male"; int n = Globals.CS_PLAYERSKINS + ent.number - 1; if (Globals.cl.configstrings[n] != null) { --- 608,612 ---- // determine what model the client is using ! String model = null; int n = Globals.CS_PLAYERSKINS + ent.number - 1; if (Globals.cl.configstrings[n] != null) { *************** *** 633,648 **** if (sfx == null) { // no, so see if it exists ! RandomAccessFile f = null; ! try { ! f = FS.FOpenFile(sexedFilename.substring(1)); ! } catch (IOException e) {} ! if (f != null) { ! // yes, close the file and register it ! try { ! FS.FCloseFile(f); ! } catch (IOException e1) {} sfx = RegisterSound(sexedFilename); ! } else { ! // no, revert to the male sound in the pak0.pak String maleFilename = "player/male/" + base.substring(1); sfx = AliasName(sexedFilename, maleFilename); --- 632,645 ---- if (sfx == null) { // no, so see if it exists ! int fileLength = FS.FileLength(sexedFilename.substring(1)); ! if (fileLength > 0) { ! // yes, register it sfx = RegisterSound(sexedFilename); ! } else if (model.equalsIgnoreCase("female")) { ! // retry it with female pak-file sounds ! String femaleFilename = "player/female/" + base.substring(1); ! sfx = AliasName(sexedFilename, femaleFilename); ! } else { ! // no chance, revert to the male sound in the pak0.pak String maleFilename = "player/male/" + base.substring(1); sfx = AliasName(sexedFilename, maleFilename); |
|
From: Carsten W. <ca...@us...> - 2004-10-21 01:50:59
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9138/src/jake2/client Modified Files: CL_parse.java Log Message: string bugs fixed Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CL_parse.java 22 Sep 2004 19:22:07 -0000 1.9 --- CL_parse.java 21 Oct 2004 01:50:49 -0000 1.10 *************** *** 396,400 **** } ! if (Globals.cl_noskins.value != 0 || s.length() != 0) { model_filename = ("players/male/tris.md2"); --- 396,400 ---- } ! if (Globals.cl_noskins.value != 0 || s.length() == 0) { model_filename = ("players/male/tris.md2"); *************** *** 508,512 **** ci = Globals.cl.clientinfo[player]; ! LoadClientinfo(ci, s); } --- 508,512 ---- ci = Globals.cl.clientinfo[player]; ! LoadClientinfo(ci, new String(s)); } *************** *** 527,531 **** olds = Globals.cl.configstrings[i]; ! Globals.cl.configstrings[i] = s; // do something apropriate --- 527,531 ---- olds = Globals.cl.configstrings[i]; ! Globals.cl.configstrings[i] = new String(s); // do something apropriate |
|
From: Carsten W. <ca...@us...> - 2004-10-20 20:39:32
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2564/src/jake2/client Modified Files: CL.java Log Message: uses netadr_t.toString() ("loopback" or IP string) Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CL.java 11 Oct 2004 14:04:16 -0000 1.13 --- CL.java 20 Oct 2004 20:39:10 -0000 1.14 *************** *** 814,819 **** c = Cmd.Argv(0); ! ! Com.Printf(NET.AdrToString(Globals.net_from) + ": " + c + "\n"); // server connection --- 814,819 ---- c = Cmd.Argv(0); ! ! Com.Println(Globals.net_from.toString() + ": " + c); // server connection |
|
From: Carsten W. <ca...@us...> - 2004-10-20 20:37:43
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2037/src/jake2/qcommon Modified Files: netadr_t.java Log Message: code cleanup Index: netadr_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/netadr_t.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** netadr_t.java 17 Oct 2004 20:33:18 -0000 1.4 --- netadr_t.java 20 Oct 2004 20:37:32 -0000 1.5 *************** *** 24,27 **** --- 24,28 ---- import jake2.Defines; + import jake2.sys.NET; import java.net.InetAddress; *************** *** 36,41 **** public byte ip[]; - InetAddress ia = null; - public netadr_t() { this.type = Defines.NA_LOOPBACK; --- 37,40 ---- *************** *** 48,59 **** public InetAddress getInetAddress() throws UnknownHostException { ! if (type == Defines.NA_BROADCAST) { ! ia = InetAddress.getByName("255.255.255.255"); ! } else if (type == Defines.NA_LOOPBACK) { ! ia = InetAddress.getByName("localhost"); ! } else if (ia == null) { ! ia = InetAddress.getByAddress(ip); } - return ia; } --- 47,60 ---- public InetAddress getInetAddress() throws UnknownHostException { ! switch (type) { ! case Defines.NA_BROADCAST: ! return InetAddress.getByName("255.255.255.255"); ! case Defines.NA_LOOPBACK: ! return InetAddress.getByName("localhost"); ! case Defines.NA_IP: ! return InetAddress.getByAddress(ip); ! default: ! return null; } } *************** *** 66,68 **** --- 67,74 ---- ip[3] = from.ip[3]; } + + public String toString() { + return (type == Defines.NA_LOOPBACK) ? "loopback" : NET + .AdrToString(this); + } } \ No newline at end of file |
|
From: Carsten W. <ca...@us...> - 2004-10-20 20:37:43
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2037/src/jake2/sys Modified Files: NET.java Log Message: code cleanup Index: NET.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/NET.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NET.java 17 Oct 2004 21:31:32 -0000 1.5 --- NET.java 20 Oct 2004 20:37:31 -0000 1.6 *************** *** 71,76 **** private static DatagramSocket[] ip_sockets = { null, null }; ! //============================================================================= ! public static boolean CompareAdr(netadr_t a, netadr_t b) { return (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2] --- 71,79 ---- private static DatagramSocket[] ip_sockets = { null, null }; ! /* ! * CompareAdr ! * ! * Compares with the port ! */ public static boolean CompareAdr(netadr_t a, netadr_t b) { return (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2] *************** *** 79,85 **** /* ! * =================== NET_CompareBaseAdr * ! * Compares without the port =================== */ public static boolean CompareBaseAdr(netadr_t a, netadr_t b) { --- 82,88 ---- /* ! * CompareBaseAdr * ! * Compares without the port */ public static boolean CompareBaseAdr(netadr_t a, netadr_t b) { *************** *** 97,112 **** } public static String AdrToString(netadr_t a) { ! return "" + (a.ip[0] & 0xff) + "." + (a.ip[1] & 0xff) + "." ! + (a.ip[2] & 0xff) + "." + (a.ip[3] & 0xff) + ":" + a.port; } public static String BaseAdrToString(netadr_t a) { ! return "" + (a.ip[0] & 0xff) + "." + (a.ip[1] & 0xff) + "." ! + (a.ip[2] & 0xff) + "." + (a.ip[3] & 0xff); } public static boolean StringToAdr(String s, netadr_t a) { ! if (s.equalsIgnoreCase("localhost")) { a.set(net_local_adr); return true; --- 100,135 ---- } + /* + * AdrToString + * + * IP address with the port + */ public static String AdrToString(netadr_t a) { ! StringBuffer sb = new StringBuffer(); ! sb.append(a.ip[0] & 0xFF).append('.').append(a.ip[1] & 0xFF); ! sb.append('.'); ! sb.append(a.ip[2] & 0xFF).append('.').append(a.ip[3] & 0xFF); ! sb.append(':').append(a.port); ! return sb.toString(); } + /* + * BaseAdrToString + * + * IP address without the port + */ public static String BaseAdrToString(netadr_t a) { ! StringBuffer sb = new StringBuffer(); ! sb.append(a.ip[0] & 0xFF).append('.').append(a.ip[1] & 0xFF); ! sb.append('.'); ! sb.append(a.ip[2] & 0xFF).append('.').append(a.ip[3] & 0xFF); ! return sb.toString(); } + /* + * StringToAdr + */ public static boolean StringToAdr(String s, netadr_t a) { ! if (s.equalsIgnoreCase("localhost") || s.equalsIgnoreCase("loopback")) { a.set(net_local_adr); return true; *************** *** 126,129 **** --- 149,155 ---- } + /* + * IsLocalAddress + */ public static boolean IsLocalAddress(netadr_t adr) { return CompareAdr(adr, net_local_adr); *************** *** 131,139 **** /* ! * ============================================================================= * * LOOPBACK BUFFERS FOR LOCAL PLAYER * ! * ============================================================================= */ --- 157,165 ---- /* ! * ================================================== * * LOOPBACK BUFFERS FOR LOCAL PLAYER * ! * ================================================== */ *************** *** 160,163 **** --- 186,192 ---- } + /* + * SendLoopPacket + */ public static void SendLoopPacket(int sock, int length, byte[] data, netadr_t to) { *************** *** 175,179 **** } ! //============================================================================= public static boolean GetPacket(int sock, netadr_t net_from, sizebuf_t net_message) { --- 204,210 ---- } ! /* ! * GetPacket ! */ public static boolean GetPacket(int sock, netadr_t net_from, sizebuf_t net_message) { *************** *** 218,223 **** } ! // ============================================================================= ! public static void SendPacket(int sock, int length, byte[] data, netadr_t to) { if (to.type == Defines.NA_LOOPBACK) { --- 249,255 ---- } ! /* ! * SendPacket ! */ public static void SendPacket(int sock, int length, byte[] data, netadr_t to) { if (to.type == Defines.NA_LOOPBACK) { *************** *** 245,252 **** } - //============================================================================= - /* ! * ==================== NET_OpenIP ==================== */ public static void OpenIP() { --- 277,282 ---- } /* ! * OpenIP */ public static void OpenIP() { *************** *** 266,270 **** /* ! * ==================== NET_Config ==================== * * A single player game will only use the loopback code --- 296,300 ---- /* ! * Config * * A single player game will only use the loopback code *************** *** 285,299 **** } - //=================================================================== - /* ! * ==================== NET_Init ==================== */ public static void Init() { ! //empty } /* ! * ==================== NET_Socket ==================== */ public static DatagramSocket Socket(int sock, String ip, int port) { --- 315,327 ---- } /* ! * Init */ public static void Init() { ! // nothing to do } /* ! * Socket */ public static DatagramSocket Socket(int sock, String ip, int port) { *************** *** 330,334 **** /* ! * ==================== NET_Shutdown ==================== */ public static void Shutdown() { --- 358,362 ---- /* ! * Shutdown */ public static void Shutdown() { |
|
From: Carsten W. <ca...@us...> - 2004-10-20 19:20:25
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fastjogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16291/src/jake2/render/fastjogl Modified Files: Image.java Log Message: memory mapped image loading and code cleanup Index: Image.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Image.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Image.java 22 Sep 2004 19:22:10 -0000 1.6 --- Image.java 20 Oct 2004 19:20:14 -0000 1.7 *************** *** 30,38 **** import jake2.client.particle_t; import jake2.game.cvar_t; ! import jake2.qcommon.Com; ! import jake2.qcommon.Cvar; ! import jake2.qcommon.FS; ! import jake2.qcommon.longjmpException; ! import jake2.qcommon.qfiles; import jake2.render.image_t; import jake2.util.Lib; --- 30,34 ---- [...1302 lines suppressed...] void GL_ShutdownImages() { --- 1574,1578 ---- /* ! * GL_ShutdownImages */ void GL_ShutdownImages() { *************** *** 1652,1660 **** continue; // free image_t slot // free it - // TODO jogl bug gl.glDeleteTextures(1, new int[] { image.texnum }); image.clear(); } } - } \ No newline at end of file --- 1585,1591 ---- |
|
From: Carsten W. <ca...@us...> - 2004-10-19 17:23:47
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv728/src/jake2/qcommon Modified Files: FS.java Log Message: new method: LoadMappedFile (memory mapped io); and code cleanup Index: FS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FS.java 18 Oct 2004 19:45:54 -0000 1.8 --- FS.java 19 Oct 2004 17:23:20 -0000 1.9 *************** *** 8,12 **** Copyright (C) 1997-2001 Id Software, Inc. ! 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; either version 2 --- 8,12 ---- Copyright (C) 1997-2001 Id Software, Inc. ! 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; either version 2 *************** *** 32,36 **** --- 32,38 ---- import java.io.*; + import java.nio.ByteBuffer; import java.nio.ByteOrder; + import java.nio.channels.FileChannel; import java.util.*; *************** *** 45,53 **** /* ! * ============================================================================= * * QUAKE FILESYSTEM * ! * ============================================================================= */ --- 47,55 ---- /* ! * ================================================== * * QUAKE FILESYSTEM * ! * ================================================== */ *************** *** 94,105 **** } ! public static List fs_links = new LinkedList(); // with ! // filelink_t ! // entries public static class searchpath_t { String filename; ! pack_t pack; // only one of filename / pack will be used searchpath_t next; --- 96,106 ---- } ! // with filelink_t entries ! public static List fs_links = new LinkedList(); public static class searchpath_t { String filename; ! pack_t pack; // only one of filename or pack will be used searchpath_t next; *************** *** 108,116 **** public static searchpath_t fs_searchpaths; ! public static searchpath_t fs_base_searchpaths; // without ! // gamedirs /* - * * All of Quake's data access is through a hierchal file system, but the * contents of the file system can be transparently merged from several --- 109,116 ---- public static searchpath_t fs_searchpaths; ! // without gamedirs ! public static searchpath_t fs_base_searchpaths; /* * All of Quake's data access is through a hierchal file system, but the * contents of the file system can be transparently merged from several *************** *** 133,139 **** /* ! * ============ FS_CreatePath * ! * Creates any directories needed to store the given filename ============ */ public static void CreatePath(String path) { --- 133,139 ---- /* ! * CreatePath * ! * Creates any directories needed to store the given filename. */ public static void CreatePath(String path) { *************** *** 149,156 **** /* ! * ============== FS_FCloseFile * * For some reason, other dll's can't just call fclose() on files returned ! * by FS_FOpenFile... ============== */ public static void FCloseFile(RandomAccessFile file) throws IOException { --- 149,156 ---- /* ! * FCloseFile * * For some reason, other dll's can't just call fclose() on files returned ! * by FS_FOpenFile... */ public static void FCloseFile(RandomAccessFile file) throws IOException { *************** *** 186,190 **** } ! // search through the path, one element at a time for (search = fs_searchpaths; search != null; search = search.next) { --- 186,190 ---- } ! // search through the path, one element at a time for (search = fs_searchpaths; search != null; search = search.next) { *************** *** 226,239 **** } /* ! * =========== FS_FOpenFile * ! * Finds the file in the search path. returns filesize and an open FILE * ! * Used for streaming data out of either a pak file or a seperate file. ! * =========== */ - - public static int file_from_pak = 0; - public static RandomAccessFile FOpenFile(String filename) throws IOException { --- 226,237 ---- } + public static int file_from_pak = 0; + /* ! * FOpenFile * ! * Finds the file in the search path. returns a RadomAccesFile. Used for ! * streaming data out of either a pak file or a seperate file. */ public static RandomAccessFile FOpenFile(String filename) throws IOException { *************** *** 264,268 **** // ! // search through the path, one element at a time // for (search = fs_searchpaths; search != null; search = search.next) { --- 262,266 ---- // ! // search through the path, one element at a time // for (search = fs_searchpaths; search != null; search = search.next) { *************** *** 311,323 **** } ! /* ! * ================= FS_ReadFile * ! * Properly handles partial reads ================= */ - public static final int MAX_READ = 0x10000; // read in - // blocks of - // 64k - public static void Read(byte[] buffer, int len, RandomAccessFile f) { --- 309,320 ---- } ! // read in blocks of 64k ! public static final int MAX_READ = 0x10000; ! ! /** ! * Read * ! * Properly handles partial reads */ public static void Read(byte[] buffer, int len, RandomAccessFile f) { *************** *** 344,348 **** } // ! // do some progress bar thing here... // remaining -= read; --- 341,345 ---- } // ! // do some progress bar thing here... // remaining -= read; *************** *** 352,359 **** /* ! * ============ FS_LoadFile * * Filename are reletive to the quake search path a null buffer will just ! * return the file length without loading ============ */ public static byte[] LoadFile(String path) { --- 349,356 ---- /* ! * LoadFile * * Filename are reletive to the quake search path a null buffer will just ! * return the file content as byte[] */ public static byte[] LoadFile(String path) { *************** *** 363,367 **** int len = 0; ! // TODO bughack for bad strings (fuck \0) int index = path.indexOf('\0'); if (index != -1) --- 360,364 ---- int len = 0; ! // TODO hack for bad strings (fuck \0) int index = path.indexOf('\0'); if (index != -1) *************** *** 387,391 **** /* ! * ============= FS_FreeFile ============= */ public static void FreeFile(byte[] buffer) { --- 384,492 ---- /* ! * LoadMappedFile ! * ! * Filename are reletive to the quake search path a null buffer will just ! * return the file content as ByteBuffer (memory mapped) ! */ ! public static ByteBuffer LoadMappedFile(String filename) { ! searchpath_t search; ! String netpath; ! pack_t pak; ! int i; ! filelink_t link; ! File file = null; ! ! int fileLength = 0; ! FileChannel channel = null; ! FileInputStream input = null; ! ByteBuffer buffer = null; ! ! file_from_pak = 0; ! ! try { ! // check for links first ! for (Iterator it = fs_links.iterator(); it.hasNext();) { ! link = (filelink_t) it.next(); ! ! if (filename.regionMatches(0, link.from, 0, link.fromlength)) { ! netpath = link.to + filename.substring(link.fromlength); ! file = new File(netpath); ! if (file.canRead()) { ! input = new FileInputStream(file); ! channel = input.getChannel(); ! fileLength = (int) channel.size(); ! buffer = channel.map(FileChannel.MapMode.READ_ONLY, 0, ! fileLength); ! input.close(); ! return buffer; ! } ! return null; ! } ! } ! ! // ! // search through the path, one element at a time ! // ! for (search = fs_searchpaths; search != null; search = search.next) { ! // is the element a pak file? ! if (search.pack != null) { ! // look through all the pak file elements ! pak = search.pack; ! filename = filename.toLowerCase(); ! packfile_t entry = (packfile_t) pak.files.get(filename); ! ! if (entry != null) { ! // found it! ! file_from_pak = 1; ! //Com.DPrintf ("PackFile: " + pak.filename + " : " + ! // filename + '\n'); ! file = new File(pak.filename); ! if (!file.canRead()) ! Com.Error(Globals.ERR_FATAL, "Couldn't reopen " ! + pak.filename); ! if (pak.handle == null || !pak.handle.getFD().valid()) { ! // hold the pakfile handle open ! pak.handle = new RandomAccessFile(pak.filename, "r"); ! } ! // open a new file on the pakfile ! ! channel = pak.handle.getChannel(); ! buffer = channel.map(FileChannel.MapMode.READ_ONLY, ! entry.filepos, entry.filelen); ! channel.close(); ! return buffer; ! } ! } else { ! // check a file in the directory tree ! netpath = search.filename + '/' + filename; ! ! file = new File(netpath); ! if (!file.canRead()) ! continue; ! ! //Com.DPrintf("FindFile: " + netpath +'\n'); ! input = new FileInputStream(file); ! channel = input.getChannel(); ! fileLength = (int) channel.size(); ! buffer = channel.map(FileChannel.MapMode.READ_ONLY, 0, ! fileLength); ! input.close(); ! return buffer; ! } ! } ! } catch (Exception e) { ! } ! try { ! if (input != null) ! input.close(); ! else if (channel != null && channel.isOpen()) ! channel.close(); ! } catch (IOException ioe) { ! } ! return null; ! } ! ! /* ! * FreeFile */ public static void FreeFile(byte[] buffer) { *************** *** 396,400 **** static class dpackheader_t { ! int ident; // == IDPAKHEADER int dirofs; --- 497,501 ---- static class dpackheader_t { ! int ident; // IDPAKHEADER int dirofs; *************** *** 405,415 **** static final int MAX_FILES_IN_PACK = 4096; /* ! * ================= FS_LoadPackFile * * Takes an explicit (not game tree related) path to a pak file. * * Loads the header and directory, adding the files at the beginning of the ! * list so they override previous pack files. ================= */ static pack_t LoadPackFile(String packfile) { --- 506,519 ---- static final int MAX_FILES_IN_PACK = 4096; + // buffer for C-Strings char[56] + static byte[] tmpText = new byte[packfile_t.NAME_SIZE]; + /* ! * LoadPackFile * * Takes an explicit (not game tree related) path to a pak file. * * Loads the header and directory, adding the files at the beginning of the ! * list so they override previous pack files. */ static pack_t LoadPackFile(String packfile) { *************** *** 449,472 **** packhandle.seek(header.dirofs); - // buffer for C-Strings char[56] - byte[] text = new byte[packfile_t.NAME_SIZE]; // parse the directory packfile_t entry = null; for (int i = 0; i < numpackfiles; i++) { ! packhandle.readFully(text); entry = new packfile_t(); ! entry.name = new String(text).trim(); entry.filepos = packhandle.readInt(); entry.filelen = packhandle.readInt(); newfiles.put(entry.name.toLowerCase(), entry); - - //logger.log(Level.FINEST, i + ".\t" + entry); } } catch (IOException e) { ! //logger.log(Level.WARNING, e.toString()); return null; } --- 553,572 ---- packhandle.seek(header.dirofs); // parse the directory packfile_t entry = null; for (int i = 0; i < numpackfiles; i++) { ! packhandle.readFully(tmpText); entry = new packfile_t(); ! entry.name = new String(tmpText).trim(); entry.filepos = packhandle.readInt(); entry.filelen = packhandle.readInt(); newfiles.put(entry.name.toLowerCase(), entry); } } catch (IOException e) { ! Com.DPrintf(e.getMessage() + '\n'); return null; } *************** *** 485,492 **** /* ! * ================ FS_AddGameDirectory * * Sets fs_gamedir, adds the directory to the head of the path, then loads ! * and adds pak1.pak pak2.pak ... ================ */ static void AddGameDirectory(String dir) { --- 585,592 ---- /* ! * AddGameDirectory * * Sets fs_gamedir, adds the directory to the head of the path, then loads ! * and adds pak1.pak pak2.pak ... */ static void AddGameDirectory(String dir) { *************** *** 531,537 **** /* ! * ============ FS_Gamedir * ! * Called to find where to write a file (demos, savegames, etc) ============ */ public static String Gamedir() { --- 631,637 ---- /* ! * Gamedir * ! * Called to find where to write a file (demos, savegames, etc) */ public static String Gamedir() { *************** *** 540,546 **** /* ! * ============= FS_ExecAutoexec ============= */ - public static void ExecAutoexec() { --- 640,645 ---- /* ! * ExecAutoexec */ public static void ExecAutoexec() { *************** *** 566,579 **** /* ! * ================ FS_SetGamedir * ! * Sets the gamedir and path to a different directory. ================ */ public static void SetGamedir(String dir) { searchpath_t next; - // if (strstr(dir, "..") || strstr(dir, "/") - // || strstr(dir, "\\") || strstr(dir, ":") ) - if (dir.indexOf("..") != -1 || dir.indexOf("/") != -1 || dir.indexOf("\\") != -1 || dir.indexOf(":") != -1) { --- 665,675 ---- /* ! * SetGamedir * ! * Sets the gamedir and path to a different directory. */ public static void SetGamedir(String dir) { searchpath_t next; if (dir.indexOf("..") != -1 || dir.indexOf("/") != -1 || dir.indexOf("\\") != -1 || dir.indexOf(":") != -1) { *************** *** 590,594 **** fs_searchpaths.pack.handle.close(); } catch (IOException e) { ! //logger.log(Level.WARNING, e.toString()); } // clear the hashtable --- 686,690 ---- fs_searchpaths.pack.handle.close(); } catch (IOException e) { ! Com.DPrintf(e.getMessage() + '\n'); } // clear the hashtable *************** *** 623,629 **** /* ! * ================ FS_Link_f * ! * Creates a filelink_t ================ */ public static void Link_f() { --- 719,725 ---- /* ! * Link_f * ! * Creates a filelink_t */ public static void Link_f() { *************** *** 661,665 **** /* ! * * FS_ListFiles */ public static String[] ListFiles(String findname, int musthave, int canthave) { --- 757,761 ---- /* ! * ListFiles */ public static String[] ListFiles(String findname, int musthave, int canthave) { *************** *** 679,683 **** /* ! * * FS_Dir_f */ public static void Dir_f() { --- 775,779 ---- /* ! * Dir_f */ public static void Dir_f() { *************** *** 721,727 **** /* ! * ============ FS_Path_f ! * ! * ============ */ public static void Path_f() { --- 817,821 ---- /* ! * Path_f */ public static void Path_f() { *************** *** 749,756 **** /* ! * ================ FS_NextPath * * Allows enumerating all of the directories in the search path - * ================ */ public static String NextPath(String prevpath) { --- 843,849 ---- /* ! * NextPath * * Allows enumerating all of the directories in the search path */ public static String NextPath(String prevpath) { *************** *** 776,780 **** /* ! * ================ FS_InitFilesystem ================ */ public static void InitFilesystem() { --- 869,873 ---- /* ! * InitFilesystem */ public static void InitFilesystem() { |
|
From: Holger Z. <hz...@us...> - 2004-10-19 13:32:45
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv580/webstart Modified Files: Tag: jogl-11 jake2_jogl11.jnlp jake2_jogl11ATI.jnlp Log Message: Index: jake2_jogl11ATI.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** jake2_jogl11ATI.jnlp 19 Oct 2004 12:08:06 -0000 1.1.2.2 --- jake2_jogl11ATI.jnlp 19 Oct 2004 13:32:36 -0000 1.1.2.3 *************** *** 19,24 **** <resources> <j2se version="1.4+" max-heap-size="128M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2-patch.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar" main="true"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="true"/> --- 19,23 ---- <resources> <j2se version="1.4+" max-heap-size="128M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2_11.jar" main="true"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="true"/> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** jake2_jogl11.jnlp 19 Oct 2004 12:08:06 -0000 1.1.2.2 --- jake2_jogl11.jnlp 19 Oct 2004 13:32:36 -0000 1.1.2.3 *************** *** 19,24 **** <resources> <j2se version="1.4+" max-heap-size="128M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2-patch.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar" main="true"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="false"/> --- 19,23 ---- <resources> <j2se version="1.4+" max-heap-size="128M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2_11.jar" main="true"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="false"/> |
|
From: Holger Z. <hz...@us...> - 2004-10-19 13:32:44
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv580 Modified Files: Tag: jogl-11 build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** build.xml 19 Sep 2004 12:49:45 -0000 1.10 --- build.xml 19 Oct 2004 13:32:36 -0000 1.10.2.1 *************** *** 112,116 **** <include name="**"/> </jar> ! <proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar" defaultpackage="" overloadaggressively="off"> <injar name="${dist}/lib/jake.jar"/> --- 112,116 ---- <include name="**"/> </jar> ! <proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2_11.jar" defaultpackage="" overloadaggressively="off"> <injar name="${dist}/lib/jake.jar"/> *************** *** 190,210 **** <copy todir="webstart/lib"> <fileset dir="${dist}/lib"> ! <include name="**/*.jar"/> </fileset> </copy> - <jar destfile="webstart/lib/linux/jogl-native.jar" basedir="${dist}/lib/linux"> - <include name="libjogl*.so"/> - </jar> - <jar destfile="webstart/lib/linux/joal-native.jar" basedir="${dist}/lib/linux"> - <include name="libjoal.so"/> - <include name="libopenal.so"/> - </jar> - <jar destfile="webstart/lib/windows/jogl-native.jar" basedir="${dist}/lib/windows"> - <include name="jogl*.dll"/> - </jar> - <jar destfile="webstart/lib/windows/joal-native.jar" basedir="${dist}/lib/windows"> - <include name="joal.dll"/> - <include name="OpenAL32.dll"/> - </jar> <signjar keystore="${user.home}/bytonic" alias="hoz" storepass="${bytonic.pass}"> <fileset dir="webstart/lib"> --- 190,196 ---- <copy todir="webstart/lib"> <fileset dir="${dist}/lib"> ! <include name="**/jake2_11.jar"/> </fileset> </copy> <signjar keystore="${user.home}/bytonic" alias="hoz" storepass="${bytonic.pass}"> <fileset dir="webstart/lib"> |
2 messages has been excluded from this view by a project administrator.
