/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-02 06:40:58 UTC
  • mfrom: (2666 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2668.
  • Revision ID: andrew.bennetts@canonical.com-20070802064058-09eblz1qbc01fcr3
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
103
103
 
104
104
        if sys.platform == "win32":
105
105
            try:
106
 
                scripts_dir = self.install_dir
 
106
                scripts_dir = os.path.join(sys.prefix, 'Scripts')
107
107
                script_path = self._quoted_path(os.path.join(scripts_dir,
108
108
                                                             "bzr"))
109
109
                python_exe = self._quoted_path(sys.executable)
110
110
                args = self._win_batch_args()
111
111
                batch_str = "@%s %s %s" % (python_exe, script_path, args)
112
 
                batch_path = script_path + ".bat"
 
112
                batch_path = os.path.join(self.install_dir, "bzr.bat")
113
113
                f = file(batch_path, "w")
114
114
                f.write(batch_str)
115
115
                f.close()
195
195
            ext_modules.append(Extension(module_name, [c_name]))
196
196
 
197
197
 
 
198
add_pyrex_extension('bzrlib._dirstate_helpers_c')
198
199
add_pyrex_extension('bzrlib._knit_load_data_c')
199
200
 
200
201
 
282
283
          zipfile='lib/library.zip')
283
284
 
284
285
else:
 
286
    # ad-hoc for easy_install
 
287
    DATA_FILES = []
 
288
    if not 'bdist_egg' in sys.argv:
 
289
        # generate and install bzr.1 only with plain install, not easy_install one
 
290
        DATA_FILES = [('man/man1', ['bzr.1'])]
 
291
 
285
292
    # std setup
286
293
    ARGS = {'scripts': ['bzr'],
287
 
            'data_files': [('man/man1', ['bzr.1'])],
 
294
            'data_files': DATA_FILES,
288
295
            'cmdclass': command_classes,
289
296
            'ext_modules': ext_modules,
290
297
           }