Commit Graph

154 Commits

Author SHA1 Message Date
Jim Teeuwen
cca9f8e6b7 Removes output of both debug and release code. There really
is no point to this.

All output (including TOC) is now written to a single output file.
This allows us to have different output file names to be specified.
Each for a different version generated code with its own build tags.
Consequently offering much greater flexibility in the way generated
code is to be used in a host application.

Fixes test outputs to match all these changes.
2013-10-30 14:45:04 +01:00
Jim Teeuwen
12a480432a Implements writing of TOC file. Refactors code for debug and release
writers. Adds output examples for various output modes.
2013-10-30 13:14:58 +01:00
Jim Teeuwen
efd0c57cfd Fixes some minor translation issues. 2013-10-30 11:42:09 +01:00
Jim Teeuwen
7125d6f515 Adds an extra testdata file to ensure that there are no
name collisions in the generated code, when it comes to
multiple assets with the same file name.

This should all receive unique entries, using their
directory paths to set them apart.
2013-10-30 02:19:24 +01:00
Jim Teeuwen
ae16b2b3c6 Finishes imlpementing the various debug and release output
modes. For debug we always read assets from disk and ignore
the compression and memcopy options. For release mode, the
assets are all embedded and the compression/memcopy options
are taken into account.
2013-10-30 02:16:14 +01:00
Jim Teeuwen
17f2782db6 Implements output of debug code.
Partially imlpements output of release code.
Reorganizes testdata directory.
2013-10-30 02:11:04 +01:00
Jim Teeuwen
c4d457542a Add some more test files and directories and implement locating
of asset files.
2013-10-29 18:23:52 +01:00
Jim Teeuwen
560fbff5df Main directory becomes the library. go-bindata subdir holds
the command code.
2013-10-29 16:17:14 +01:00
Jim Teeuwen
6187b52beb Strips existing code. Refactors directory structure and begins
implementation of version 3.0.1.
2013-10-29 16:16:12 +01:00
jimt
79847ab3e9 Merge pull request #12 from octplane/issue-11
Fix for issue #11
2013-10-02 06:05:46 -07:00
Pierre Baillet
3b99b93ffc Fix for issue #11 2013-10-02 08:50:28 +02:00
jimt
edbc082b2f Merge pull request #10 from octplane/mine/master
Make bindata usable as a Library
2013-09-30 15:07:12 -07:00
Pierre Baillet
de61f8ffd8 Additionale export
- SafeFuncname
- Tiny doc patch
2013-09-30 21:49:43 +02:00
Pierre Baillet
e6d1b0ecbd Made the code usable as a library
- Library is named bindata
- Currently exports: Translate
- The library code is in lib/
2013-09-30 21:48:27 +02:00
jimt
6fb0150f0c Merge pull request #9 from eliasnaur/master
Added support for build tags with the -tags flag
2013-09-19 08:39:46 -07:00
Elias Naur
f813d1c931 Added support for build tags with the -tags flag 2013-09-19 17:27:54 +02:00
Jim Teeuwen
871202fb0f Bumps minor version. 2013-08-01 12:12:39 +02:00
Jim Teeuwen
0cd33e9b7d Reverts change to -out flag. One should specify the full path
of the target file, instead of just the target directory.

This allows us to overwrite a generated file from a previous
build cycle. This addresses issue #8
2013-08-01 12:10:59 +02:00
Jim Teeuwen
98703b5677 Adds a check to ensure the specified output directory actually exists. 2013-07-26 23:47:30 +02:00
Jim Teeuwen
f0faa42c2f Changes the meaning of the -out command line flag.
This now expects a directory path to store the generated file(s) in.
This was previously a path with file name. We now always use
the filename, inferred from the input path.
2013-07-25 23:58:17 +02:00
Jim Teeuwen
dcda30b1ad Runs go fmt. 2013-07-25 23:57:40 +02:00
Jim Teeuwen
ff063d28c6 * Bump version to new release: 2.0.0
We do this, because the changes in this patch fundamentally
  alter the way code is generated by the tool. This will, in some
  cases, be incompatible with older versions.
* Performs cleanup and minor code fixes.
* Adds two new command line flags:
  * -prefix: This accepts a partial path. It is used when generating
    a target function name, as well as the key for the Table of Contents
    map (see below). The specified prefix is applied to the input
    file name, causing the prefix section to be stripped from the
    input file path. E.g.:
    ```
    input: /path/to/foo.x
    prefix: /path/to
    output: /foo.x
    ```
  * -toc: This is a boolean flag which tells the tool to generate
    a table of contents for the generated data files. It creates
    a separate 'bindata-toc.go' file, which defines a global map
    named `go_bindata`. It then appends an `init` function to the
    generated file. This function makes the data function register
    itself with the global map.
* Fixes the function names the tool infers from input file names
  to include the full path. This fixes potential name collisions
  when the same file name is processed from different directories.
  For example, we can now safely import the following two files:
  ```
   input file: css/ie/foo.css
   output function: css_ie_foo_css()

   input file: css/chrome/foo.css
   output function: css_chrome_foo_css()
  ```
2013-07-25 22:46:12 +02:00
Jim Teeuwen
6a3f0aca94 Bumps version number. 2013-07-07 13:04:43 +02:00
Jim Teeuwen
10c722dc95 Fixes bug in StringWriter, which causes the compiler to
generate a segfault when there are too many string
concatenations. This happens when we convert a file of
about 100kb or larger.

The fix modifies the StringWriter to write the file data
out into a single, long string, without concatenations.

This addresses issue #5
2013-07-07 13:02:07 +02:00
jimt
0877d93299 Minor cleanup of README. 2013-03-09 13:37:09 +01:00
jimt
b6af78b318 Merges translation functions into translate.go.
Runs gofmt on code.
2013-03-09 13:31:48 +01:00
jimt
5f066faee3 Fix issue 4. Removes debug output from pipe mode. 2013-01-26 21:06:46 +01:00
jimt
cd9bcb69b1 Fixes grammar issues in comments for generated functions. 2012-10-12 14:15:18 +02:00
jimt
015755bcf8 Fixes some inconsistencies in README. 2012-09-04 17:15:15 +02:00
jimt
fea0373680 Merge pull request #3 from ajhager/master
Fix Writers returning n-1 bytes written.
2012-07-14 11:20:48 -07:00
Joseph Hager
93063b64a3 Fix Writers returning n-1 bytes written.
ByteWriter and StringWriter were returning n-1 bytes written which was
causing io.Copy to error out with a ShortWrite. This would cause files
that were larger than the io.Copy internal buffer (32 * 1024) to stop
after the first chunk.
2012-07-13 14:57:50 -04:00
jim teeuwen
98c1704190 Combine the old and new code generation methods. We can select the .rodata hack described in issue #1 by supplying the -m commandline flag. The default code generation mode is the old one. While it uses more memory, it is a safer version and offers no problems when used on platforms that restrict usage of the unsafe and reflect packages. Additionally I did some cleanup and refactoring of the code. Bumped version to 1.0.0 2012-06-22 14:12:15 +02:00
jim teeuwen
c2d800d607 Cosmetic fixes. 2012-06-14 11:20:10 +02:00
jim teeuwen
37af2a4b27 Fix generated code for both compressed and uncompressed modes. We now no longer require a memcpy to read the static file data and can get it directly from the .rodata section. This addresses issue #1 2012-06-13 14:17:25 +02:00
jim teeuwen
ed2cd8b81c Some more code cleanup. 2012-06-07 23:34:34 +02:00
jim teeuwen
665944b444 Remove some unneccesary code bits. 2012-06-07 23:28:16 +02:00
jim teeuwen
6214789c41 Fixed typo in flag description text. 2012-03-28 01:43:03 +02:00
jim teeuwen
384e0cafe9 Added -u flag. When this is supplied to the program, no compression of the input data will take place. This also means the generated source code changes from a function to a global variable. The function is only there because it has to decompress the binary data. When no compression is used, this is obviously not necessary. Default behaviour is still the same (with compression) so existing code using this program will not break. Fixed README to reflect new behaviour. Added new testdata examples for both compressed and uncompressed output. 2012-03-28 01:39:01 +02:00
jim teeuwen
0450ba8421 Change signature of generated function to only return the decompressed byte slice. The error value is removed. Instead the function will panic when a decompression error occurs. This allows us to assign the data to global variables were necessary. A decompression error is considered a deal breaker and therefor the panic is warranted. 2012-03-08 11:47:57 +01:00
jim teeuwen
360acac596 Update README to reflect fix in generated file. 2012-03-06 19:31:58 +01:00
jim teeuwen
fea0fad8ad Fix output for generated file. 2012-03-06 19:30:35 +01:00
jim teeuwen
ccc86c4533 Fix for weekly.2012-02-14 2012-02-15 12:37:05 +01:00
jim teeuwen
02da4740e4 Fix generate doutput code. os.Error -> error. Remove calling of go fmt from code. This should really be done manually. 2012-02-11 16:49:43 +01:00
jim teeuwen
2b9a31984c No more Makefiles. Use go command to build and install. 2012-02-09 17:35:10 +01:00
jim teeuwen
7df69a98df gofmt -s -w 2011-12-07 13:49:06 +01:00
jim teeuwen
470290002e gofix go1rename 2011-11-09 14:46:27 +01:00
jim teeuwen
468e190b33 gofix error 2011-11-02 16:41:07 +01:00
jim teeuwen
efcb2b8d06 gofix error 2011-11-02 16:40:26 +01:00
jim teeuwen
5b255b58ee Changed code to use new rune type unicode code points. 2011-10-26 11:59:30 +02:00
jim teeuwen
2985202b2b Fix function and package names if the user supplied versions start with a digit. 2011-06-27 18:45:39 +02:00